ubuntutools/lp/lpapicache.py:

* Add support for anonymous login to the Launchpad singleton.
ubuntutools/lp/udtexceptions.py:
* Add AlreadyLoggedInError

ubuntutools/lp/lpapicache.py

@@ -26,6 +26,7 @@
 
 import sys
 
+import launchpadlib.launchpad as launchpad
 from launchpadlib.errors import HTTPError
 from launchpadlib.uris import lookup_service_root
 from lazr.restfulclient.resource import Entry
@@ -35,28 +36,33 @@ from ubuntutools.lp import service
 from ubuntutools.lp.udtexceptions import *
 
 class Launchpad(object):
-	''' Singleton for LP API access. '''
+    '''Singleton for LP API access.'''
-	__lp = None
 
-	def login(self):
+    def login(self):
-		'''
+        '''Enforce a non-anonymous login.'''
-		Enforce a login through the LP API.
+        if '_Launchpad__lp' not in self.__dict__:
-		'''
+            try:
-		if not self.__lp:
+                self.__lp = libsupport.get_launchpad('ubuntu-dev-tools')
-			try:
+            except IOError, error:
-				self.__lp = libsupport.get_launchpad('ubuntu-dev-tools')
+                print >> sys.stderr, 'E: %s' % error
-			except IOError, error:
+                raise
-				print >> sys.stderr, 'E: %s' % error
+        else:
-				raise error
+            raise AlreadyLoggedInError('Already logged in to Launchpad.')
-		return self
 
-	def __getattr__(self, attr):
+    def login_anonymously(self):
-		if not self.__lp:
+        '''Enforce an anonymous login.'''
-			self.login()
+        if '_Launchpad__lp' not in self.__dict__:
-		return getattr(self.__lp, attr)
+            self.__lp = launchpad.Launchpad.login_anonymously('ubuntu-dev-tools', service)
+        else:
+            raise AlreadyLoggedInError('Already logged in to Launchpad.')
 
-	def __call__(self):
+    def __getattr__(self, attr):
-		return self
+        if '_Launchpad__lp' not in self.__dict__:
+            self.login()
+        return getattr(self.__lp, attr)
+
+    def __call__(self):
+        return self
 Launchpad = Launchpad()
 
 

ubuntutools/lp/udtexceptions.py

@@ -13,3 +13,7 @@ class PocketDoesNotExistException(BaseException):
 class ArchiveNotFoundException(BaseException):
 	""" Thrown when an archive for a distibution is not found """
 	pass
+
+class AlreadyLoggedInError(Exception):
+    '''Raised when a second login is attempted.'''
+    pass