Merge lp:~salgado/launchpad/update-pygpgme into lp:launchpad

[Guilherme Salgado]

Use the latest pygpgme, in preparation for switching to python2.6.

The last pygpgme revision (r49) includes a merge from trunk, which
brings http://bazaar.launchpad.net/~jamesh/pygpgme/trunk/revision/57
that was responsible for turning gpgmekey.fpr into a unicode. That
exposed a bug in our code where we were not ascii-encoding the
fingerprint before passing it to gpgme.Context.export(), like all other
callsites on that module do.

Another alternative here would be to change PymeKey._buildFromGpgmeKey()
to store the ascii-encoded fingerprint, instead of the unicode one, in
an instance variable. I'd be in favour of this, I think.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/canonical/launchpad/utilities/gpghandler.py
  lib/lp/archiveuploader/tests/nascentuploadfile.txt
  lib/lp/registry/doc/gpg-signatures.txt
  lib/canonical/launchpad/doc/emailauthentication.txt
  lib/canonical/launchpad/doc/gpghandler.txt
  lib/lp/soyuz/doc/soyuz-upload.txt
  utilities/sourcedeps.conf

== Pylint notices ==

lib/canonical/launchpad/utilities/gpghandler.py
    25: [F0401] Unable to import 'gpgme'
    26: [F0401] Unable to import 'gpgme'
    30: [F0401] Unable to import 'canonical.config'
    31: [F0401] Unable to import 'lp.registry.interfaces.gpg'
    33: [F0401] Unable to import 'canonical.launchpad.interfaces.gpghandler'
    37: [F0401] Unable to import 'canonical.launchpad.validators.email'

[Brad Crittenden (bac)]

Thanks for the fix Salgado.

To get around the unicode marker in test output we decided to do:

>>> print name
Salgado

instead of

>>> name
u'Salgado'

I think that is less fragile. Would you make the change? Of course you can't do anything about the unicode inside the exceptions.

review: Approve (code)

[Guilherme Salgado (salgado)]

On Tue, 2010-04-20 at 20:07 +0000, Brad Crittenden wrote:
> Review: Approve code
> Thanks for the fix Salgado.

Thank you for the review!

>
> To get around the unicode marker in test output we decided to do:
>
> >>> print name
> Salgado
>
> instead of
>
> >>> name
> u'Salgado'
>
> I think that is less fragile. Would you make the change? Of course you can't do anything about the unicode inside the exceptions.

I didn't know we have a policy for that, but I'm happy to change that,
except for the cases where the string is empty or contains non-ascii
characters. Attached is the incremental diff.

=== modified file 'lib/canonical/launchpad/doc/emailauthentication.txt'
--- lib/canonical/launchpad/doc/emailauthentication.txt	2009-02-19 23:55:18 +0000
+++ lib/canonical/launchpad/doc/emailauthentication.txt	2010-04-21 11:58:24 +0000
@@ -116,7 +116,7 @@
     ...     msg.signedContent, msg.signature)
     Traceback (most recent call last):
     ...
-    GPGVerificationError: (7, 8, 'Bad signature')
+    GPGVerificationError: (7, 8, u'Bad signature')
 
     >>> getUtility(IGPGHandler).getVerifiedSignature(
     ...     msg.signedContent.replace('\n', '\r\n'), msg.signature)

=== modified file 'lib/canonical/launchpad/doc/gpghandler.txt'
--- lib/canonical/launchpad/doc/gpghandler.txt	2009-01-19 16:15:15 +0000
+++ lib/canonical/launchpad/doc/gpghandler.txt	2010-04-21 11:58:24 +0000
@@ -59,8 +59,8 @@
     >>> verifyObject(IPymeKey, key)
     True
 
-    >>> key.fingerprint
-    'A419AE861E88BC9E04B9C26FBA2B9389DFD20543'
+    >>> print key.fingerprint
+    A419AE861E88BC9E04B9C26FBA2B9389DFD20543
 
     >>> print key.secret
     False
@@ -119,8 +119,8 @@
     >>> assert key is not None
     >>> verifyObject(IPymeKey, key)
     True
-    >>> key.fingerprint
-    'A419AE861E88BC9E04B9C26FBA2B9389DFD20543'
+    >>> print key.fingerprint
+    A419AE861E88BC9E04B9C26FBA2B9389DFD20543
 
 But we get an error if the damage is big:
 (what probably happened in bug #2547)
@@ -230,10 +230,10 @@
     Launchpad PPA for Celso áéíóú Providelo
 
     >>> uid.comment
-    ''
+    u''
 
     >>> uid.email
-    ''
+    u''
 
 The public key is also available.
 

=== modified file 'lib/canonical/launchpad/utilities/gpghandler.py'
--- lib/canonical/launchpad/utilities/gpghandler.py	2010-03-12 19:56:06 +0000
+++ lib/canonical/launchpad/utilities/gpghandler.py	2010-04-21 11:58:24 +0000
@@ -374,7 +374,7 @@
 
         # Sign the text.
         try:
-            result = context.sign(plaintext, signature, mode)
+            context.sign(plaintext, signature, mode)
         except gpgme.GpgmeError:
             return None
 
@@ -620,7 +620,7 @@
         context = gpgme.Context()
         context.armor = True
         keydata = StringIO()
-        context.export(self.fingerprint, keydata)
+        context.export(self.fingerprint.encode('ascii'), keydata)
 
         return keydata.getvalue()
 

=== modified file 'lib/lp/archivepublisher/tests/archive-signing.txt'
--- lib/lp/archivepublisher/tests/archive-signing.txt	2010-03-11 16:09:29 +0000
+++ lib/lp/archivepublisher/tests/archive-signing.txt	2010-04-21 11:58:24 +0000
@@ -230,8 +230,7 @@
 
     >>> [uid] = retrieved_key.uids
     >>> uid.name
-    'Launchpad PPA for
-     Celso \xc3\xa1\xc3\xa9\xc3\xad\xc3\xb3\xc3\xba Providelo'
+    u'Launchpad PPA for Celso \xe1\xe9\xed\xf3\xfa Providelo'
 
 The secret key is securily stored in the designed configuration
 path. So only the IGPGHandler itself can access it.

=== modified file 'lib/lp/archiveuploader/tests/nascentuploadfile.txt'
--- lib/lp/archiveuploader/tests/nascentuploadfile.txt	2009-12-14 13:49:03 +0000
+++ lib/lp/archiveuploader/tests/nascentuploadfile.txt	2010-04-21 11:58:24 +0000
@@ -468,8 +468,8 @@
 
 The IGPGKey fingerprint used to sign this ChangesFile:
 
-    >>> ed_mixed_changes.fingerprint
-    '340CA3BB270E2716C9EE0B768E7EB7086C64A8C5'
+    >>> print ed_mixed_changes.fingerprint
+    340CA3BB270E2716C9EE0B768E7EB7086C64A8C5
 
 
 == DSCFile ==
@@ -530,8 +530,8 @@
 
 The IGPGKey fingerprint used to sign this DSC:
 
-    >>> ed_mixed_dsc.fingerprint
-    '340CA3BB270E2716C9EE0B768E7EB7086C64A8C5'
+    >>> print ed_mixed_dsc.fingerprint
+    340CA3BB270E2716C9EE0B768E7EB7086C64A8C5
 
 A DSCFile provides a verification API similiar to what we have in
 ChangesFile itself:

=== modified file 'lib/lp/registry/doc/gpg-signatures.txt'
--- lib/lp/registry/doc/gpg-signatures.txt	2009-04-17 10:32:16 +0000
+++ lib/lp/registry/doc/gpg-signatures.txt	2010-04-21 11:58:24 +0000
@@ -23,8 +23,6 @@
     >>> from zope.component import getUtility
     >>> gpghandler = getUtility(IGPGHandler)
 
-    >>> from canonical.launchpad.interfaces import GPGVerificationError
-
 The text below was "clear signed" by 0xDFD20543 master key:
 
     >>> content = """-----BEGIN PGP SIGNED MESSAGE-----
@@ -41,8 +39,8 @@
     ... """
 
     >>> master_sig = gpghandler.verifySignature(content)
-    >>> master_sig.fingerprint	
-    'A419AE861E88BC9E04B9C26FBA2B9389DFD20543'
+    >>> print master_sig.fingerprint
+    A419AE861E88BC9E04B9C26FBA2B9389DFD20543
 
 The text below was "clear signed" by a 0x02BA5EF6, a subkey of 0xDFD20543
 
@@ -61,8 +59,8 @@
     >>>
 
     >>> subkey_sig = gpghandler.verifySignature(content)
-    >>> subkey_sig.fingerprint
-    'A419AE861E88BC9E04B9C26FBA2B9389DFD20543'
+    >>> print subkey_sig.fingerprint
+    A419AE861E88BC9E04B9C26FBA2B9389DFD20543
 
 
    >>> master_sig.fingerprint == subkey_sig.fingerprint
@@ -86,7 +84,7 @@
     >>> master_sig = gpghandler.getVerifiedSignature(content)
     Traceback (most recent call last):
     ...
-    GPGVerificationError: (7, 8, 'Bad signature')
+    GPGVerificationError: (7, 8, u'Bad signature')
 
 If no signed content is found, an exception is raised:
 
@@ -111,22 +109,22 @@
     >>> content = """
     ... -----BEGIN PGP SIGNED MESSAGE-----
     ... Hash: SHA1
-    ... 
+    ...
     ... Test Message.
     ... -----BEGIN PGP SIGNATURE-----
     ... Version: GnuPG v1.4.1 (GNU/Linux)
-    ... 
+    ...
     ... iD8DBQFD3xV52yWXVgK6XvYRAtJQAJ4ojuLC4aap4R9T0og17RkPYoND+ACfbCA3
     ... yrZD6MZcqzyaGNy1s28Co2Q=
     ... =5QGd
     ... -----END PGP SIGNATURE-----
     ... -----BEGIN PGP SIGNED MESSAGE-----
     ... Hash: SHA1
-    ... 
+    ...
     ... Some data appended by [e-mail]
     ... -----BEGIN PGP SIGNATURE-----
     ... Version: GnuPG v1.4.1 (GNU/Linux)
-    ... 
+    ...
     ... iD8DBQFD3xWpjn63CGxkqMURAmi6AJ4yHAnhIpt49VlYDG1uxpGy9BmHwwCeKbFM
     ... aHIJLqhWVf8bGLHZBIH5odw=
     ... =iUSC
@@ -166,7 +164,7 @@
     >>> gpghandler.getVerifiedSignature(content)
     Traceback (most recent call last):
     ...
-    GPGVerificationError: (7, 9, 'No public key')
+    GPGVerificationError: (7, 9, u'No public key')
 
 Due to unpredictable behaviour between the production system and
 the external keyserver, we have a resilient signature verifier,
@@ -179,4 +177,7 @@
     >>> gpghandler.getVerifiedSignatureResilient(content)
     Traceback (most recent call last):
     ...
-    GPGVerificationError: Verification failed 3 times: ["(7, 9, 'No public key')", "(7, 9, 'No public key')", "(7, 9, 'No public key')"]
+    GPGVerificationError: Verification failed 3 times:
+    ["(7, 9, u'No public key')",
+     "(7, 9, u'No public key')",
+     "(7, 9, u'No public key')"]

=== modified file 'lib/lp/soyuz/doc/soyuz-upload.txt'
--- lib/lp/soyuz/doc/soyuz-upload.txt	2010-04-15 02:09:00 +0000
+++ lib/lp/soyuz/doc/soyuz-upload.txt	2010-04-21 11:58:24 +0000
@@ -70,10 +70,7 @@
 
   >>> from lp.archiveuploader.tagfiles import parse_tagfile
   >>> from canonical.config import config
-  >>> from cStringIO import StringIO
   >>> import glob
-  >>> import time
-  >>>
   >>> test_files_dir = os.path.join(config.root,
   ...                               "lib/lp/soyuz/scripts/"
   ...                               "tests/upload_test_files/")
@@ -223,8 +220,8 @@
   >>> key_data = open(key_path).read()
   >>> key = gpg_handler.importPublicKey(key_data)
   >>> assert key is not None
-  >>> key.fingerprint
-  '33C0A61893A5DC5EB325B29E415A12CAC2F30234'
+  >>> print key.fingerprint
+  33C0A61893A5DC5EB325B29E415A12CAC2F30234
 
 
 Create the katie user and register it in a team that is allowed to
@@ -532,7 +529,6 @@
 
   >>> from canonical.launchpad.database import (
   ...    SourcePackagePublishingHistory as SSPPH)
-  >>> from canonical.launchpad.interfaces import PackagePublishingStatus
   >>> package_names.sort()
   >>> for name in package_names:
   ...     spn = SourcePackageName.selectOneBy(name=name)

=== modified file 'utilities/sourcedeps.conf'
--- utilities/sourcedeps.conf	2010-04-20 00:57:04 +0000
+++ utilities/sourcedeps.conf	2010-04-21 11:58:24 +0000
@@ -11,7 +11,7 @@
 mailman lp:~launchpad-pqm/mailman/2.1;revno=976
 old_xmlplus lp:~launchpad-pqm/dtdparser/trunk;revno=4
 pygettextpo lp:~launchpad-pqm/pygettextpo/trunk;revno=23
-pygpgme lp:~launchpad-pqm/pygpgme/devel;revno=48
+pygpgme lp:~launchpad-pqm/pygpgme/devel;revno=49
 subvertpy lp:~launchpad-pqm/subvertpy/trunk;revno=2040
 testresources lp:~launchpad-pqm/testresources/dev;revno=16
 shipit lp:~launchpad-pqm/shipit/trunk;revno=8904 optional