diff options
| author | Dwayne C. Litzenberger <dlitz@dlitz.net> | 2011-10-22 15:07:47 -0400 |
|---|---|---|
| committer | Dwayne C. Litzenberger <dlitz@dlitz.net> | 2011-10-22 15:07:47 -0400 |
| commit | 094d70b64d6b575841c6d340f2391b977bc61694 (patch) | |
| tree | caa140eb47c78615f3d8eaa37115aaef7d650418 /lib/Crypto/SelfTest/Random | |
| parent | a23efbfbb7e6ead0ae87a2c3f889ca4a4ef00d4a (diff) | |
| download | pycrypto-094d70b64d6b575841c6d340f2391b977bc61694.tar.gz | |
Python 3.x fixes:
- Use absolute imports
- Fix StringIO import so that 2to3 can translate it
Diffstat (limited to 'lib/Crypto/SelfTest/Random')
| -rw-r--r-- | lib/Crypto/SelfTest/Random/Fortuna/__init__.py | 6 | ||||
| -rw-r--r-- | lib/Crypto/SelfTest/Random/OSRNG/__init__.py | 10 | ||||
| -rw-r--r-- | lib/Crypto/SelfTest/Random/__init__.py | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/lib/Crypto/SelfTest/Random/Fortuna/__init__.py b/lib/Crypto/SelfTest/Random/Fortuna/__init__.py index bd31e72..81a0e13 100644 --- a/lib/Crypto/SelfTest/Random/Fortuna/__init__.py +++ b/lib/Crypto/SelfTest/Random/Fortuna/__init__.py @@ -30,9 +30,9 @@ import os def get_tests(config={}): tests = [] - import test_FortunaAccumulator; tests += test_FortunaAccumulator.get_tests(config=config) - import test_FortunaGenerator; tests += test_FortunaGenerator.get_tests(config=config) - import test_SHAd256; tests += test_SHAd256.get_tests(config=config) + from Crypto.SelfTest.Random.Fortuna import test_FortunaAccumulator; tests += test_FortunaAccumulator.get_tests(config=config) + from Crypto.SelfTest.Random.Fortuna import test_FortunaGenerator; tests += test_FortunaGenerator.get_tests(config=config) + from Crypto.SelfTest.Random.Fortuna import test_SHAd256; tests += test_SHAd256.get_tests(config=config) return tests if __name__ == '__main__': diff --git a/lib/Crypto/SelfTest/Random/OSRNG/__init__.py b/lib/Crypto/SelfTest/Random/OSRNG/__init__.py index b41bb7d..44b3fa1 100644 --- a/lib/Crypto/SelfTest/Random/OSRNG/__init__.py +++ b/lib/Crypto/SelfTest/Random/OSRNG/__init__.py @@ -31,13 +31,13 @@ import os def get_tests(config={}): tests = [] if os.name == 'nt': - import test_nt; tests += test_nt.get_tests(config=config) - import test_winrandom; tests += test_winrandom.get_tests(config=config) + from Crypto.SelfTest.Random.OSRNG import test_nt; tests += test_nt.get_tests(config=config) + from Crypto.SelfTest.Random.OSRNG import test_winrandom; tests += test_winrandom.get_tests(config=config) elif os.name == 'posix': - import test_posix; tests += test_posix.get_tests(config=config) + from Crypto.SelfTest.Random.OSRNG import test_posix; tests += test_posix.get_tests(config=config) if hasattr(os, 'urandom'): - import test_fallback; tests += test_fallback.get_tests(config=config) - import test_generic; tests += test_generic.get_tests(config=config) + from Crypto.SelfTest.Random.OSRNG import test_fallback; tests += test_fallback.get_tests(config=config) + from Crypto.SelfTest.Random.OSRNG import test_generic; tests += test_generic.get_tests(config=config) return tests if __name__ == '__main__': diff --git a/lib/Crypto/SelfTest/Random/__init__.py b/lib/Crypto/SelfTest/Random/__init__.py index 5dcad2d..48d84ff 100644 --- a/lib/Crypto/SelfTest/Random/__init__.py +++ b/lib/Crypto/SelfTest/Random/__init__.py @@ -28,10 +28,10 @@ __revision__ = "$Id$" def get_tests(config={}): tests = [] - import Fortuna; tests += Fortuna.get_tests(config=config) - import OSRNG; tests += OSRNG.get_tests(config=config) - import test_random; tests += test_random.get_tests(config=config) - import test_rpoolcompat; tests += test_rpoolcompat.get_tests(config=config) + from Crypto.SelfTest.Random import Fortuna; tests += Fortuna.get_tests(config=config) + from Crypto.SelfTest.Random import OSRNG; tests += OSRNG.get_tests(config=config) + from Crypto.SelfTest.Random import test_random; tests += test_random.get_tests(config=config) + from Crypto.SelfTest.Random import test_rpoolcompat; tests += test_rpoolcompat.get_tests(config=config) return tests if __name__ == '__main__': |