Merge lp:~salgado/launchpad/py2.5-teammembership into lp:~launchpad-committers/launchpad/python-migration

[Guilherme Salgado]

[Guilherme Salgado (salgado)]

Fix a couple teammembership tests and remove some unused imports.

[Barry Warsaw (barry)]

review: Approve

=== modified file 'lib/canonical/launchpad/webapp/breadcrumb.py'
--- lib/canonical/launchpad/webapp/breadcrumb.py	2009-09-18 04:06:03 +0000
+++ lib/canonical/launchpad/webapp/breadcrumb.py	2009-10-14 20:50:23 +0000
@@ -13,8 +13,6 @@
     ]
 
 
-from zope.traversing.interfaces import IPathAdapter
-from zope.component import queryAdapter
 from zope.interface import implements
 
 from canonical.launchpad.webapp import canonical_url
@@ -56,8 +54,12 @@
             return self._url
 
     def __repr__(self):
+        # XXX: salgado, 2009-10-14, http://bugs.python.org/issue5876: In
+        # python 2.5, the return value of __repr__() may be forced into a
+        # type(str), so we can't include unicode here.
+        text = self.text.encode('raw-unicode-escape')
         return "<%s url='%s' text='%s'>" % (
-            self.__class__.__name__, self.url, self.text)
+            self.__class__.__name__, self.url, text)
 
 
 class NameBreadcrumb(Breadcrumb):

=== modified file 'lib/lp/registry/doc/teammembership.txt'
--- lib/lp/registry/doc/teammembership.txt	2009-08-13 15:12:16 +0000
+++ lib/lp/registry/doc/teammembership.txt	2009-10-14 20:50:23 +0000
@@ -134,14 +134,10 @@
 
     >>> from zope.security.interfaces import Unauthorized
     >>> mark = personset.getByName('mark')
-    >>> try:
-    ...     t3.addMember(
-    ...         salgado, reviewer=mark, status=TeamMembershipStatus.ADMIN)
-    ... except Unauthorized, info:
-    ...     print Unauthorized, info
-    ... else:
-    ...     print "No exception raised"
-    zope.security.interfaces.Unauthorized (..., 'addMember', 'launchpad.Edit')
+    >>> t3.addMember(salgado, reviewer=mark, status=TeamMembershipStatus.ADMIN)
+    Traceback (most recent call last):
+    ...
+    Unauthorized:...
 
     # Log in as the team owner.
     >>> login_person(t3.teamowner)