expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2024-11-23 15:51:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[svn r8041] Fix edit conflict screwup

Browse Source
This commit is contained in:
aaron 2008-10-27 19:12:12 +01:00
parent 646c8fcf51
commit 0575f0630e
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
troggle/parsers/cavetab.py
View File

@ -4,11 +4,8 @@ import settings
import expo.models as models import expo.models as models
import csv import csv
import time import time
<<<<<<< .mine
#import sqlite3 #import sqlite3
=======
# import sqlite3
>>>>>>> .r8038
import re import re
import os import os
@ -65,13 +62,8 @@ caveReader = csv.reader(cavetab)
caveReader.next() # Strip out column headers caveReader.next() # Strip out column headers
<<<<<<< .mine
def save(x): #There seems to be an intermitent problem with sqlite and Vista, uncomment the lines below and the "import sqlite3" above to fix it
# try:
=======
def save(x): #There seems to be an intermitent problem with sqlite and Vista, uncomment the lines below, and the import sqlite3 statment above to fix it def save(x): #There seems to be an intermitent problem with sqlite and Vista, uncomment the lines below, and the import sqlite3 statment above to fix it
# try: # try:
>>>>>>> .r8038
x.save() x.save()
# except sqlite3.OperationalError: # except sqlite3.OperationalError:
# print "Error" # print "Error"