diff options
| author | Matěj Cepl <mcepl@cepl.eu> | 2018-03-18 23:11:38 +0100 |
|---|---|---|
| committer | Matěj Cepl <mcepl@cepl.eu> | 2018-03-20 18:47:23 +0100 |
| commit | 17f7ca77afa75cedaa60bf3db767119adba4a2ec (patch) | |
| tree | 0c4ff5f475bce84a3e7e88ab83b32dd38892066c /tests/test_ssl.py | |
| parent | b977909fc93caa599e52943be25b7f6042a4c70b (diff) | |
| download | m2crypto-17f7ca77afa75cedaa60bf3db767119adba4a2ec.tar.gz | |
PEP8isation
Specially replace complicated construct with unittest2 to one import to
M2Crypto top module.
Also, Rand.load_file should have first parameter as bytes(), not str().
Diffstat (limited to 'tests/test_ssl.py')
| -rw-r--r-- | tests/test_ssl.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/test_ssl.py b/tests/test_ssl.py index 7c683dc..55ba0d1 100644 --- a/tests/test_ssl.py +++ b/tests/test_ssl.py @@ -30,13 +30,10 @@ import sys import tempfile import time import warnings -try: - import unittest2 as unittest -except ImportError: - import unittest from M2Crypto import (Err, Rand, SSL, X509, ftpslib, httpslib, m2, m2urllib, m2urllib2, m2xmlrpclib, py27plus, six) +from tests import unittest from tests.fips import fips_mode log = logging.getLogger('test_SSL') |