Fix DNSSEC imports, again!

diff --git a/ChangeLog b/ChangeLog
index de1fe7a72373ac0c0893fa4693ecfcf2e5b90050..91e69d3ea2f2d45ec39ff17afb1e2dce36f152d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-23  Bob Halley  <halley@dnspython.org>
+
+       * (Version 1.9.2 released)
+
+2010-11-23  Bob Halley  <halley@dnspython.org>
+
+       * dns/dnssec.py (_need_pycrypto): DSA and RSA are modules, not
+         functions, and I didn't notice because the test suite masked
+         the bug!  *sigh*
+
 2010-11-22  Bob Halley  <halley@dnspython.org>
 
        * (Version 1.9.1 released)

diff --git a/README b/README
index ca6b3a466d38b9dcb09c229baa2dd69cb7d9e762..d53dac61aba9e8b6736f69f650988f1b795d0d9d 100644 (file)
--- a/README
+++ b/README
@@ -22,13 +22,23 @@ development by continuing to employ the author :).
 
 ABOUT THIS RELEASE
 
-This is dnspython 1.9.1
+This is dnspython 1.9.2
+
+New since 1.9.1:
+
+       Nothing.
+
+Bugs fixed since 1.9.1:
+
+       The dns.dnssec module didn't work at all due to missing
+       imports that escaped detection in testing because the test
+       suite also did the imports.  The third time is the charm!
 
 New since 1.9.0:
 
        Nothing.
 
-Bugs fixed since 1.9.0
+Bugs fixed since 1.9.0:
 
         The dns.dnssec module didn't work with DSA due to namespace
        contamination from a "from"-style import.

diff --git a/dns/dnssec.py b/dns/dnssec.py
index d2d607d9d78f58d48ceff5727fc4cf30bbec5732..a595fd44782534cd8a9038185d109eeb7ea4283e 100644 (file)
--- a/dns/dnssec.py
+++ b/dns/dnssec.py
@@ -362,7 +362,8 @@ def _need_pycrypto(*args, **kwargs):
     raise NotImplementedError, "DNSSEC validation requires pycrypto"
 
 try:
-    import Crypto.PublicKey
+    import Crypto.PublicKey.RSA
+    import Crypto.PublicKey.DSA
     import Crypto.Util.number
     validate = _validate
     validate_rrsig = _validate_rrsig

diff --git a/dns/version.py b/dns/version.py
index 8d20c1343a10a72c4934b53a8546504d160b333a..fe0e324217be94fddf9604d2c16d0fcd9bfaa1f2 100644 (file)
--- a/dns/version.py
+++ b/dns/version.py
@@ -17,7 +17,7 @@
 
 MAJOR = 1
 MINOR = 9
-MICRO = 1
+MICRO = 2
 RELEASELEVEL = 0x0f
 SERIAL = 0
 

diff --git a/setup.py b/setup.py
index 01fddf7b54178e26660bb7d64e73686fba050979..59bd0ebc952d748e2b76b5f5618d9f8df8433259 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@
 import sys
 from distutils.core import setup
 
-version = '1.9.1'
+version = '1.9.2'
 
 kwargs = {
     'name' : 'dnspython',

diff --git a/tests/dnssec.py b/tests/dnssec.py
index 7e99d410d844713c4de8fe4429322a1396910ff4..b30e847fbac430ddb8ae0c4c88644771e9db1f30 100644 (file)
--- a/tests/dnssec.py
+++ b/tests/dnssec.py
@@ -136,7 +136,6 @@ class DNSSECValidatorTestCase(unittest.TestCase):
 if __name__ == '__main__':
     import_ok = False
     try:
-        from Crypto.PublicKey import RSA,DSA
         import Crypto.Util.number
         import_ok = True
     except: