Use py27compat module for compatibility. Removes undeclared dependenc…

…y on six and fixes #266.
jaraco · Mar 19, 2017 · 36fdb8a · 36fdb8a
1 parent a600d75
commit 36fdb8a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,9 @@
+10.3.1
+------
+
+* #266: Use private compatibity model rather than six to
+  avoid the dependency.
+
 10.3
 ----
 

diff --git a/keyring/backends/_OS_X_API.py b/keyring/backends/_OS_X_API.py
@@ -3,7 +3,8 @@
 import struct
 from ctypes import c_void_p, c_uint16, c_uint32, c_int32, c_char_p, POINTER
 
-import six
+from keyring.py27compat import string_types, add_metaclass
+
 
 sec_keychain_ref = sec_keychain_item_ref = c_void_p
 OS_status = c_int32
@@ -145,20 +146,20 @@ def unpack(word):
         >>> PackedAttributes.unpack('abcd')
         1633837924
         """
-        if not isinstance(word, six.string_types):
+        if not isinstance(word, string_types):
             return word
         val, = struct.unpack('!I', word.encode('ascii'))
         return val
 
 
-@six.add_metaclass(PackedAttributes)
+@add_metaclass(PackedAttributes)
 class SecProtocolType(object):
     kSecProtocolTypeHTTP = 'http'
     kSecProtocolTypeHTTPS = 'htps'
     kSecProtocolTypeFTP = 'ftp '
 
 
-@six.add_metaclass(PackedAttributes)
+@add_metaclass(PackedAttributes)
 class SecAuthenticationType(object):
     """
     >>> SecAuthenticationType.kSecAuthenticationTypeDefault