← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to database/schema/fti.py

  • Committer: William Grant
  • Date: 2011-12-31 00:07:44 UTC
  • mto: This revision was merged to the branch mainline in revision 14610.
  • Revision ID: william.grant@canonical.com-20111231000744-h2127zdtoqbrrymm
Revert database/schema/fti.py changes, as they can't land to devel directly. Add shims to cope with old import paths.

Show diffs side-by-side

added added

removed removed

Lines of Context:
database/schema/fti.py
11
11
"""
12
12
__metaclass__ = type
13
13
 
14
 
import _pythonpath
15
 
 
16
14
from distutils.version import LooseVersion
17
15
from optparse import OptionParser
18
16
import os.path
22
20
from textwrap import dedent
23
21
import time
24
22
 
 
23
import _pythonpath
25
24
import psycopg2.extensions
 
25
import replication.helpers
26
26
 
27
27
from canonical.config import config
28
 
from canonical.launchpad.scripts import (
29
 
    db_options,
30
 
    logger,
31
 
    logger_options,
32
 
    )
33
 
from lp.services.database.postgresql import ConnectionString
34
 
from lp.services.database.sqlbase import (
 
28
from canonical.database.postgresql import ConnectionString
 
29
from canonical.database.sqlbase import (
35
30
    connect,
36
31
    ISOLATION_LEVEL_AUTOCOMMIT,
37
32
    ISOLATION_LEVEL_READ_COMMITTED,
38
33
    quote,
39
34
    quote_identifier,
40
35
    )
41
 
import replication.helpers
 
36
from canonical.launchpad.scripts import (
 
37
    db_options,
 
38
    logger,
 
39
    logger_options,
 
40
    )
42
41
 
43
42
# Defines parser and locale to use.
44
43
DEFAULT_CONFIG = 'default'