1. Daniel Holth
  2. cryptacular

Commits

Daniel Holth  committed ef0f0e0

relative import for fallback pbkdf2; update trove classifiers

  • Participants
  • Parent commits 14f4338
  • Branches default

Comments (0)

Files changed (3)

File CHANGES.txt

View file
  • Ignore whitespace
+1.3
+===
+- Python 3 support contributed by Frank Smit (some tests do not run)
+- Fix staticmethod issue with CRYPTPasswordManager
+
 1.2.1
 =====
 - Constant-time comparison of hashes

File cryptacular/pbkdf2/__init__.py

View file
  • Ignore whitespace
     import M2Crypto.EVP
     _pbkdf2 = M2Crypto.EVP.pbkdf2
 except (ImportError, AttributeError): # pragma NO COVERAGE
-    import pbkdf2
+    from . import pbkdf2
     _pbkdf2 = pbkdf2.pbkdf2
 
 class PBKDF2PasswordManager(object):

File setup.py

View file
  • Ignore whitespace
         "Development Status :: 5 - Production/Stable",
         "Intended Audience :: Developers",
         "Programming Language :: Python",
+        "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 2.6",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.2",
+        "Programming Language :: Python :: Implementation :: CPython",
+        "Programming Language :: Python :: Implementation :: PyPy",
         "Programming Language :: C",
         "Topic :: Security :: Cryptography",
         ],