xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

[svn] Fix edit conflict screwup

Browse Source 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8041 by aaron @ 10/27/2008 6:12 PM
This commit is contained in:
substantialnoninfringinguser
2009-05-13 05:15:05 +01:00
parent dde16108dd
commit f5d3c9d281
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
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"