← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

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

  • Committer: William Grant
  • Date: 2011-12-22 05:37:22 UTC
  • mto: This revision was merged to the branch mainline in revision 14581.
  • Revision ID: william.grant@canonical.com-20111222053722-gm6h9zi3lioz00ky
Move librarian stuff from canonical.launchpad to lp.services.librarian. canonical.librarian remains untouched.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/canonical/librarian/client.py
147
147
            name = name.encode('utf-8')
148
148
 
149
149
        # Import in this method to avoid a circular import
150
 
        from canonical.launchpad.database.librarian import LibraryFileContent
151
 
        from canonical.launchpad.database.librarian import LibraryFileAlias
 
150
        from lp.services.librarian.model import LibraryFileContent
 
151
        from lp.services.librarian.model 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 canonical.launchpad.database.librarian import LibraryFileAlias
 
341
        from lp.services.librarian.model import LibraryFileAlias
342
342
        from sqlobject import SQLObjectNotFound
343
343
        try:
344
344
            lfa = LibraryFileAlias.get(aliasID)