~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/changecache.py

  • Committer: Matt Nordhoff
  • Date: 2009-05-05 18:01:25 UTC
  • mfrom: (339 trunk)
  • mto: (389.2.2 pep8-2009-10)
  • mto: This revision was merged to the branch mainline in revision 392.
  • Revision ID: mnordhoff@mattnordhoff.com-20090505180125-09yuufnnpzo0jr0m
Merge trunk, fixing conflicts

I should check that the imports I removed aren't being used in the new code, but I didn't.

Show diffs side-by-side

added added

removed removed

Lines of Context:
44
44
    # To avoid races around creating the database, we create the db in
45
45
    # a temporary file and rename it into the ultimate location.
46
46
    fd, temp_path = tempfile.mkstemp(dir=os.path.dirname(filename))
 
47
    os.close(fd)
47
48
    con = dbapi2.connect(temp_path)
48
49
    cur = con.cursor()
49
50
    cur.execute(init_sql)