Merge branch 'release/3.1.1'

Author: isislovecruft

.travis.yml

@@ -0,0 +1,22 @@
+language: python
+
+python:
+  - "2.7"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "3.5-dev"
+  - "3.6"
+  - "3.6-dev"  # 3.6 development branch
+  - "3.7-dev"  # 3.7 development branch
+
+install:
+  - pip install -r requirements.txt
+  - pip install -r requirements.test.txt
+  - python setup.py install --record installed-files.txt
+
+before_script:
+  - make test-before
+
+script:
+  - python pretty_bad_protocol/test/test_gnupg.py basic encodings parsers keyrings listkeys genkey sign crypt expiration signing

Makefile

@@ -78,9 +78,9 @@ py3k-test-run: test-before
 		listkeys \
 		genkey \
 		sign \
-		crypt \
-		expiration \
-		signing
+		crypt
+#		expiration \
+#		signing
 
 coverage-run: test-before
 	coverage run --rcfile=".coveragerc" $(PYTHON) $(TESTHANDLE) \
@@ -119,9 +119,9 @@ clean-test:
 	-rm $(TESTDIR)/logs/placeholder.log
 	-rm $(TESTDIR)/random_seed*
 
-test: test-run clean-test
+test: test-run
 
-py3k-test: py3k-test-run clean-test
+py3k-test: py3k-test-run
 
 coverage: coverage-run coverage-report coverage-html clean-test
 

pretty_bad_protocol/_logger.py

@@ -66,7 +66,7 @@ def create_logger(level=logging.NOTSET):
     50   CRITICAL Unhandled exceptions and tracebacks.
     ==== ======== ========================================
     """
-    _test = os.path.join(os.path.join(os.getcwd(), 'gnupg'), 'test')
+    _test = os.path.join(os.path.join(os.getcwd(), 'pretty_bad_protocol'), 'test')
     _now  = datetime.now().strftime("%Y-%m-%d_%H%M%S")
     _fn   = os.path.join(_test, "%s_test_gnupg.log" % _now)
     _fmt  = "%(relativeCreated)-4d L%(lineno)-4d:%(funcName)-18.18s %(levelname)-7.7s %(message)s"

pretty_bad_protocol/_parsers.py

@@ -978,7 +978,7 @@ def _handle_status(self, key, value):
             self.status = nodata(value)
         elif key == "PROGRESS":
             self.status = progress(value.split(' ', 1)[0])
-        elif key == ("PINENTRY_LAUNCHED"):
+        elif key == "PINENTRY_LAUNCHED":
             log.warn(("GnuPG has just attempted to launch whichever pinentry "
                       "program you have configured, in order to obtain the "
                       "passphrase for this key.  If you did not use the "
@@ -1253,6 +1253,14 @@ def _handle_status(self, key, value):
         if key == "IMPORTED":
             # this duplicates info we already see in import_ok & import_problem
             pass
+        elif key == "PINENTRY_LAUNCHED":
+            log.warn(("GnuPG has just attempted to launch whichever pinentry "
+                      "program you have configured, in order to obtain the "
+                      "passphrase for this key.  If you did not use the "
+                      "`passphrase=` parameter, please try doing so.  Otherwise, "
+                      "see Issues #122 and #137:"
+                      "\nhttps://github.com/isislovecruft/python-gnupg/issues/122"
+                      "\nhttps://github.com/isislovecruft/python-gnupg/issues/137"))
         elif key == "KEY_CONSIDERED":
             self.results.append({
                 'status': key.replace("_", " ").lower(),
@@ -1496,12 +1504,15 @@ def _handle_status(self, key, value):
                 "PLAINTEXT_LENGTH",
                 "POLICY_URL",
                 "DECRYPTION_INFO",
+                "DECRYPTION_KEY",
                 "DECRYPTION_OKAY",
                 "INV_SGNR",
                 "PROGRESS",
                 "PINENTRY_LAUNCHED",
                 "SUCCESS",
                 "UNEXPECTED",
+                "ENCRYPTION_COMPLIANCE_MODE",
+                "VERIFICATION_COMPLIANCE_MODE",
             ):
             pass
         elif key == "KEY_CONSIDERED":

pretty_bad_protocol/_util.py

@@ -200,9 +200,7 @@ def s(x):
 def binary(data):
     coder = find_encodings()
 
-    if _py3k and isinstance(data, bytes):
-        encoded = coder.encode(data.decode(coder.name))[0]
-    elif _py3k and isinstance(data, str):
+    if _py3k and isinstance(data, str):
         encoded = coder.encode(data)[0]
     elif not _py3k and type(data) is not str:
         encoded = coder.encode(data)[0]
@@ -242,7 +240,11 @@ def _copy_data(instream, outstream):
             break
 
         sent += len(data)
-        encoded = binary(data)
+        if ((_py3k and isinstance(data, str)) or
+            (not _py3k and isinstance(data, basestring))):
+            encoded = binary(data)
+        else:
+            encoded = data
         log.debug("Sending %d bytes of data..." % sent)
         log.debug("Encoded data (type %s):\n%s" % (type(encoded), encoded))
 
@@ -440,7 +442,7 @@ def _has_readwrite(path):
     :rtype: bool
     :returns: True if real uid/gid has read+write permissions, False otherwise.
     """
-    return os.access(path, os.R_OK ^ os.W_OK)
+    return os.access(path, os.R_OK | os.W_OK)
 
 def _is_file(filename):
     """Check that the size of the thing which is supposed to be a filename has

pretty_bad_protocol/gnupg.py

@@ -44,6 +44,7 @@
 from ._util    import _is_list_or_tuple
 from ._util    import _is_stream
 from ._util    import _make_binary_stream
+from ._util    import b
 from ._util    import log
 
 
@@ -468,13 +469,17 @@ def list_keys(self, secret=False):
         >>> assert print1 in pubkeys.fingerprints
         >>> assert print2 in pubkeys.fingerprints
         """
-
         which = 'public-keys'
         if secret:
             which = 'secret-keys'
-        args = "--list-%s --fixed-list-mode --fingerprint " % (which,)
-        args += "--with-colons --list-options no-show-photos"
-        args = [args]
+
+        args = []
+        args.append("--fixed-list-mode")
+        args.append("--fingerprint")
+        args.append("--with-colons")
+        args.append("--list-options no-show-photos")
+        args.append("--list-%s" % (which))
+
         p = self._open_subprocess(args)
 
         # there might be some status thingumy here I should handle... (amk)
@@ -528,7 +533,7 @@ def sign_key(self, keyid, default_key=None, passphrase=None):
         p = self._open_subprocess(args)
         result = self._result_map['signing'](self)
         confirm_command = "%sy\n" % input_command
-        p.stdin.write(confirm_command)
+        p.stdin.write(b(confirm_command))
         self._collect_output(p, result, stdin=p.stdin)
         return result
 
@@ -626,10 +631,10 @@ def expire(self, keyid, expiration_time='1y', passphrase=None, expire_subkeys=Tr
 
         args = ["--command-fd 0", "--edit-key %s" % keyid]
         p = self._open_subprocess(args)
-        p.stdin.write(expiration_input)
+        p.stdin.write(b(expiration_input))
 
         result = self._result_map['expire'](self)
-        p.stdin.write(expiration_input)
+        p.stdin.write(b(expiration_input))
 
         self._collect_output(p, result, stdin=p.stdin)
         return result

pretty_bad_protocol/test/files/kat.pub

@@ -1,5 +1,5 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2
+Version: GnuPG v1
 
 mQINBFPcDfoBEACjsm+2o3Ip5IFXA9mUMGuSfWBL2G2bMvB8ZEjp9+DmiWzDUApH
 Bk5RQaXXN1lp41Z4POQy9FV735rpBJLcb36/uU8Fm1LwLBqJYcUiB2JsAUsS7scS
@@ -12,40 +12,40 @@ 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
-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
-=JU4o
+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
+=Gq2d
 -----END PGP PUBLIC KEY BLOCK-----