Merge pull request #412 from prebuilder/six

Got rid of `six`.

pgpy/constants.py

@@ -16,8 +16,6 @@
 
 from pyasn1.type.univ import ObjectIdentifier
 
-import six
-
 from cryptography.hazmat.backends import openssl
 from cryptography.hazmat.primitives.asymmetric import ec
 from cryptography.hazmat.primitives.ciphers import algorithms
@@ -63,13 +61,8 @@ def __rand__(self, other):  # pragma: no cover
         return self & other
 
 
-if six.PY2:
-    class FlagEnum(IntEnum):
-        __metaclass__ = FlagEnumMeta
-
-else:
-    namespace = FlagEnumMeta.__prepare__('FlagEnum', (IntEnum,))
-    FlagEnum = FlagEnumMeta('FlagEnum', (IntEnum,), namespace)
+namespace = FlagEnumMeta.__prepare__('FlagEnum', (IntEnum,))
+FlagEnum = FlagEnumMeta('FlagEnum', (IntEnum,), namespace)
 
 
 
@@ -336,9 +329,6 @@ def compress(self, data):
         raise NotImplementedError(self)
 
     def decompress(self, data):
-        if six.PY2:
-            data = bytes(data)
-
         if self is CompressionAlgorithm.Uncompressed:
             return data
 

pgpy/decorators.py

@@ -2,7 +2,6 @@
 """
 import contextlib
 import functools
-import six
 import logging
 
 try:
@@ -116,8 +115,7 @@ def check_attributes(self, key):
                                "".format(attr=attr, eval=str(expected), got=str(getattr(key, attr))))
 
     def __call__(self, action):
-        # @functools.wraps(action)
-        @six.wraps(action)
+        @functools.wraps(action)
         def _action(key, *args, **kwargs):
             if key._key is None:
                 raise PGPError("No key!")

pgpy/packet/packets.py

@@ -11,8 +11,6 @@
 
 from datetime import datetime, timezone
 
-import six
-
 from cryptography.hazmat.primitives import constant_time
 from cryptography.hazmat.primitives.asymmetric import padding
 
@@ -697,7 +695,7 @@ def signer(self):
         return self._signer
 
     @signer.register(str)
-    @signer.register(six.text_type)
+    @signer.register(str)
     def signer_str(self, val):
         self._signer = val
 
@@ -719,7 +717,7 @@ def __bytearray__(self):
         _bytes += bytearray([self.sigtype])
         _bytes += bytearray([self.halg])
         _bytes += bytearray([self.pubalg])
-        _bytes += binascii.unhexlify(six.b(self.signer))
+        _bytes += binascii.unhexlify(self.signer.encode("latin-1"))
         _bytes += bytearray([int(self.nested)])
         return _bytes
 

pgpy/packet/subpackets/signature.py

@@ -10,8 +10,6 @@
 from datetime import timedelta
 from datetime import timezone
 
-import six
-
 from .types import EmbeddedSignatureHeader
 from .types import Signature
 
@@ -69,7 +67,7 @@ def uri(self):
         return self._uri
 
     @uri.register(str)
-    @uri.register(six.text_type)
+    @uri.register(str)
     def uri_str(self, val):
         self._uri = val
 
@@ -420,7 +418,7 @@ def regex(self):
         return self._regex
 
     @regex.register(str)
-    @regex.register(six.text_type)
+    @regex.register(str)
     def regex_str(self, val):
         self._regex = val
 
@@ -550,7 +548,7 @@ def fingerprint(self):
         return self._fingerprint
 
     @fingerprint.register(str)
-    @fingerprint.register(six.text_type)
+    @fingerprint.register(str)
     @fingerprint.register(Fingerprint)
     def fingerprint_str(self, val):
         self._fingerprint = Fingerprint(val)
@@ -633,7 +631,7 @@ def name(self):
         return self._name
 
     @name.register(str)
-    @name.register(six.text_type)
+    @name.register(str)
     def name_str(self, val):
         self._name = val
 
@@ -646,7 +644,7 @@ def value(self):
         return self._value
 
     @value.register(str)
-    @value.register(six.text_type)
+    @value.register(str)
     def value_str(self, val):
         self._value = val
 
@@ -761,7 +759,7 @@ def userid(self):
         return self._userid
 
     @userid.register(str)
-    @userid.register(six.text_type)
+    @userid.register(str)
     def userid_str(self, val):
         self._userid = val
 
@@ -805,7 +803,7 @@ def string(self):
         return self._string
 
     @string.register(str)
-    @string.register(six.text_type)
+    @string.register(str)
     def string_str(self, val):
         self._string = val
 
@@ -932,7 +930,7 @@ def issuer_fingerprint(self):
         return self._issuer_fpr
 
     @issuer_fingerprint.register(str)
-    @issuer_fingerprint.register(six.text_type)
+    @issuer_fingerprint.register(str)
     @issuer_fingerprint.register(Fingerprint)
     def issuer_fingerprint_str(self, val):
         self._issuer_fpr = Fingerprint(val)
@@ -1004,7 +1002,7 @@ def intended_recipient(self):
         return self._intended_recipient
 
     @intended_recipient.register(str)
-    @intended_recipient.register(six.text_type)
+    @intended_recipient.register(str)
     @intended_recipient.register(Fingerprint)
     def intended_recipient_str(self, val):
         self._intended_recipient = Fingerprint(val)

pgpy/packet/subpackets/userattribute.py

@@ -8,8 +8,6 @@
 
 from ...decorators import sdproperty
 
-from ...memoryview import memoryview
-
 
 __all__ = ('Image',)
 
@@ -100,7 +98,6 @@ def __bytearray__(self):
     def parse(self, packet):
         super(Image, self).parse(packet)
 
-        # on Python 2, this will be the wrapper object from memoryview.py
         with memoryview(packet) as _head:
             _, self.version, self.iencoding, _, _, _ = struct.unpack_from('<hbbiii', _head[:16].tobytes())
         del packet[:16]

pgpy/packet/types.py

@@ -5,8 +5,6 @@
 import abc
 import copy
 
-import six
-
 from ..constants import PacketTag
 
 from ..decorators import sdproperty
@@ -149,7 +147,7 @@ class Packet(Dispatchable):
     def __init__(self, _=None):
         super(Packet, self).__init__()
         self.header = self.__headercls__()
-        if isinstance(self.__typeid__, six.integer_types):
+        if isinstance(self.__typeid__, int):
             self.header.tag = self.__typeid__
 
     @abc.abstractmethod
@@ -176,7 +174,7 @@ class VersionedPacket(Packet):
 
     def __init__(self):
         super(VersionedPacket, self).__init__()
-        if isinstance(self.__ver__, six.integer_types):
+        if isinstance(self.__ver__, int):
             self.header.version = self.__ver__
 
     def __repr__(self):
@@ -237,8 +235,7 @@ class Sub(Key):
 
 
 # This is required for class MPI to work in both Python 2 and 3
-if not six.PY2:
-    long = int
+long = int
 
 
 class MPI(long):