← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/canonical/librarian/client.py

  • Committer: Curtis Hovey
  • Date: 2011-12-18 15:13:07 UTC
  • mto: This revision was merged to the branch mainline in revision 14547.
  • Revision ID: curtis.hovey@canonical.com-20111218151307-sdm2gzobt5tplbe0
Moved badges to lp.app.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/canonical/librarian/client.py
35
35
from zope.component import getUtility
36
36
from zope.interface import implements
37
37
 
38
 
from lp.services.config import (
 
38
from canonical.config import (
39
39
    config,
40
40
    dbconfig,
41
41
    )
42
 
from lp.services.database.postgresql import ConnectionString
43
 
from lp.services.librarian.interfaces.client import (
 
42
from canonical.database.postgresql import ConnectionString
 
43
from canonical.launchpad.webapp.interfaces import (
 
44
    IStoreSelector,
 
45
    MAIN_STORE,
 
46
    MASTER_FLAVOR,
 
47
    )
 
48
from canonical.librarian.interfaces import (
44
49
    DownloadFailed,
45
50
    ILibrarianClient,
46
51
    IRestrictedLibrarianClient,
49
54
    UploadFailed,
50
55
    )
51
56
from lp.services.timeline.requesttimeline import get_request_timeline
52
 
from lp.services.webapp.interfaces import (
53
 
    IStoreSelector,
54
 
    MAIN_STORE,
55
 
    MASTER_FLAVOR,
56
 
    )
57
57
 
58
58
 
59
59
def url_path_quote(filename):
147
147
            name = name.encode('utf-8')
148
148
 
149
149
        # Import in this method to avoid a circular import
150
 
        from lp.services.librarian.model import LibraryFileContent
151
 
        from lp.services.librarian.model import LibraryFileAlias
 
150
        from canonical.launchpad.database.librarian import LibraryFileContent
 
151
        from canonical.launchpad.database.librarian import LibraryFileAlias
152
152
 
153
153
        self._connect()
154
154
        try:
338
338
        :raises: `DownloadFailed` if the alias is invalid or
339
339
            inaccessible.
340
340
        """
341
 
        from lp.services.librarian.model import LibraryFileAlias
 
341
        from canonical.launchpad.database.librarian import LibraryFileAlias
342
342
        from sqlobject import SQLObjectNotFound
343
343
        try:
344
344
            lfa = LibraryFileAlias.get(aliasID)