← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to database/schema/upgrade.py

  • Committer: William Grant
  • Date: 2011-12-30 06:47:17 UTC
  • mto: This revision was merged to the branch mainline in revision 14610.
  • Revision ID: william.grant@canonical.com-20111230064717-n5re5t6we5w8o17z
Replace canonical.database usage everywhere, and format-imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
database/schema/upgrade.py
9
9
 
10
10
__metaclass__ = type
11
11
 
12
 
# pylint: disable-msg=W0403
13
 
import _pythonpath  # Sort PYTHONPATH
 
12
import _pythonpath
14
13
 
15
14
from cStringIO import StringIO
16
15
import glob
 
16
from optparse import OptionParser
17
17
import os.path
18
 
from optparse import OptionParser
19
18
import re
20
19
from tempfile import NamedTemporaryFile
21
20
from textwrap import dedent
23
22
from bzrlib.branch import Branch
24
23
from bzrlib.errors import NotBranchError
25
24
 
26
 
from lp.services.scripts import db_options, logger_options, logger
27
 
from canonical.database.sqlbase import (
 
25
from lp.services.database.postgresql import fqn
 
26
from lp.services.database.sqlbase import (
28
27
    connect,
29
28
    ISOLATION_LEVEL_AUTOCOMMIT,
30
29
    sqlvalues,
31
30
    )
32
 
from canonical.database.postgresql import fqn
 
31
from lp.services.scripts import (
 
32
    db_options,
 
33
    logger,
 
34
    logger_options,
 
35
    )
33
36
import replication.helpers
34
37
 
35
38