aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorIlya Etingof <etingof@gmail.com>2017-11-23 09:55:31 +0100
committerIlya Etingof <etingof@gmail.com>2017-11-23 10:36:54 +0100
commitd3f166fd034c286a2e7eaff6d690343f4bc7a56c (patch)
treef398188807ab1a9cda3785a9fdcb569b5c90164c /tests
parent3d7f65f52b1a4b38f7ca561d460a78125dd31df1 (diff)
downloadpyasn1-d3f166fd034c286a2e7eaff6d690343f4bc7a56c.tar.gz
imports pep8'ed
Diffstat (limited to 'tests')
-rw-r--r--tests/base.py3
-rw-r--r--tests/codec/ber/test_decoder.py11
-rw-r--r--tests/codec/ber/test_encoder.py6
-rw-r--r--tests/codec/cer/test_encoder.py5
-rw-r--r--tests/codec/der/test_decoder.py1
-rw-r--r--tests/codec/der/test_encoder.py5
-rw-r--r--tests/codec/native/test_decoder.py4
-rw-r--r--tests/codec/native/test_encoder.py4
-rw-r--r--tests/type/test_char.py7
-rw-r--r--tests/type/test_constraint.py3
-rw-r--r--tests/type/test_namedtype.py3
-rw-r--r--tests/type/test_opentype.py5
-rw-r--r--tests/type/test_univ.py2
-rw-r--r--tests/type/test_useful.py5
14 files changed, 44 insertions, 20 deletions
diff --git a/tests/base.py b/tests/base.py
index 0330e23..ccb0db8 100644
--- a/tests/base.py
+++ b/tests/base.py
@@ -4,9 +4,10 @@
# Copyright (c) 2005-2017, Ilya Etingof <etingof@gmail.com>
# License: http://snmplabs.com/pyasn1/license.html
#
-import sys
+
try:
import unittest2 as unittest
+
except ImportError:
import unittest
diff --git a/tests/codec/ber/test_decoder.py b/tests/codec/ber/test_decoder.py
index 8374fd0..83a2fe7 100644
--- a/tests/codec/ber/test_decoder.py
+++ b/tests/codec/ber/test_decoder.py
@@ -5,15 +5,22 @@
# License: http://snmplabs.com/pyasn1/license.html
#
import sys
+
try:
import unittest2 as unittest
+
except ImportError:
import unittest
from tests.base import BaseTestCase
-from pyasn1.type import tag, namedtype, opentype, univ, char
-from pyasn1.codec.ber import decoder, eoo
+from pyasn1.type import tag
+from pyasn1.type import namedtype
+from pyasn1.type import opentype
+from pyasn1.type import univ
+from pyasn1.type import char
+from pyasn1.codec.ber import decoder
+from pyasn1.codec.ber import eoo
from pyasn1.compat.octets import ints2octs, str2octs, null
from pyasn1.error import PyAsn1Error
diff --git a/tests/codec/ber/test_encoder.py b/tests/codec/ber/test_encoder.py
index 34d2ba0..fed207e 100644
--- a/tests/codec/ber/test_encoder.py
+++ b/tests/codec/ber/test_encoder.py
@@ -14,7 +14,11 @@ except ImportError:
from tests.base import BaseTestCase
-from pyasn1.type import tag, namedtype, opentype, univ, char
+from pyasn1.type import tag
+from pyasn1.type import namedtype
+from pyasn1.type import opentype
+from pyasn1.type import univ
+from pyasn1.type import char
from pyasn1.codec.ber import encoder
from pyasn1.compat.octets import ints2octs
from pyasn1.error import PyAsn1Error
diff --git a/tests/codec/cer/test_encoder.py b/tests/codec/cer/test_encoder.py
index ecb2ae1..2adc5ed 100644
--- a/tests/codec/cer/test_encoder.py
+++ b/tests/codec/cer/test_encoder.py
@@ -13,7 +13,10 @@ except ImportError:
from tests.base import BaseTestCase
-from pyasn1.type import tag, namedtype, univ, useful
+from pyasn1.type import tag
+from pyasn1.type import namedtype
+from pyasn1.type import univ
+from pyasn1.type import useful
from pyasn1.codec.cer import encoder
from pyasn1.compat.octets import ints2octs
from pyasn1.error import PyAsn1Error
diff --git a/tests/codec/der/test_decoder.py b/tests/codec/der/test_decoder.py
index d9119cd..82718c7 100644
--- a/tests/codec/der/test_decoder.py
+++ b/tests/codec/der/test_decoder.py
@@ -8,6 +8,7 @@ import sys
try:
import unittest2 as unittest
+
except ImportError:
import unittest
diff --git a/tests/codec/der/test_encoder.py b/tests/codec/der/test_encoder.py
index 2e3e74d..a9c00a4 100644
--- a/tests/codec/der/test_encoder.py
+++ b/tests/codec/der/test_encoder.py
@@ -8,12 +8,15 @@ import sys
try:
import unittest2 as unittest
+
except ImportError:
import unittest
from tests.base import BaseTestCase
-from pyasn1.type import tag, namedtype, univ
+from pyasn1.type import tag
+from pyasn1.type import namedtype
+from pyasn1.type import univ
from pyasn1.codec.der import encoder
from pyasn1.compat.octets import ints2octs
diff --git a/tests/codec/native/test_decoder.py b/tests/codec/native/test_decoder.py
index 6f3a520..b711e96 100644
--- a/tests/codec/native/test_decoder.py
+++ b/tests/codec/native/test_decoder.py
@@ -8,12 +8,14 @@ import sys
try:
import unittest2 as unittest
+
except ImportError:
import unittest
from tests.base import BaseTestCase
-from pyasn1.type import namedtype, univ
+from pyasn1.type import namedtype
+from pyasn1.type import univ
from pyasn1.codec.native import decoder
from pyasn1.error import PyAsn1Error
diff --git a/tests/codec/native/test_encoder.py b/tests/codec/native/test_encoder.py
index 9aa5ba7..d24bdc3 100644
--- a/tests/codec/native/test_encoder.py
+++ b/tests/codec/native/test_encoder.py
@@ -8,12 +8,14 @@ import sys
try:
import unittest2 as unittest
+
except ImportError:
import unittest
from tests.base import BaseTestCase
-from pyasn1.type import namedtype, univ
+from pyasn1.type import namedtype
+from pyasn1.type import univ
from pyasn1.codec.native import encoder
from pyasn1.compat.octets import str2octs
from pyasn1.error import PyAsn1Error
diff --git a/tests/type/test_char.py b/tests/type/test_char.py
index fd34374..a84b4c3 100644
--- a/tests/type/test_char.py
+++ b/tests/type/test_char.py
@@ -4,17 +4,20 @@
# Copyright (c) 2005-2017, Ilya Etingof <etingof@gmail.com>
# License: http://snmplabs.com/pyasn1/license.html
#
-import sys
import pickle
+import sys
try:
import unittest2 as unittest
+
except ImportError:
import unittest
from tests.base import BaseTestCase
-from pyasn1.type import char, univ, constraint
+from pyasn1.type import char
+from pyasn1.type import univ
+from pyasn1.type import constraint
from pyasn1.compat.octets import ints2octs
from pyasn1.error import PyAsn1Error
diff --git a/tests/type/test_constraint.py b/tests/type/test_constraint.py
index ea97225..a502b1a 100644
--- a/tests/type/test_constraint.py
+++ b/tests/type/test_constraint.py
@@ -14,7 +14,8 @@ except ImportError:
from tests.base import BaseTestCase
-from pyasn1.type import constraint, error
+from pyasn1.type import constraint
+from pyasn1.type import error
class SingleValueConstraintTestCase(BaseTestCase):
diff --git a/tests/type/test_namedtype.py b/tests/type/test_namedtype.py
index b6c38cc..71a15b4 100644
--- a/tests/type/test_namedtype.py
+++ b/tests/type/test_namedtype.py
@@ -14,7 +14,8 @@ except ImportError:
from tests.base import BaseTestCase
-from pyasn1.type import namedtype, univ
+from pyasn1.type import namedtype
+from pyasn1.type import univ
from pyasn1.error import PyAsn1Error
diff --git a/tests/type/test_opentype.py b/tests/type/test_opentype.py
index f6cbcb9..f2a4d2f 100644
--- a/tests/type/test_opentype.py
+++ b/tests/type/test_opentype.py
@@ -16,14 +16,9 @@ from tests.base import BaseTestCase
from pyasn1.type import univ
from pyasn1.type import tag
-from pyasn1.type import constraint
from pyasn1.type import namedtype
-from pyasn1.type import namedval
from pyasn1.type import opentype
-from pyasn1.type import error
from pyasn1.compat.octets import str2octs
-from pyasn1.compat.octets import ints2octs
-from pyasn1.compat.octets import octs2ints
from pyasn1.error import PyAsn1Error
diff --git a/tests/type/test_univ.py b/tests/type/test_univ.py
index ea6c4d0..1999706 100644
--- a/tests/type/test_univ.py
+++ b/tests/type/test_univ.py
@@ -4,9 +4,9 @@
# Copyright (c) 2005-2017, Ilya Etingof <etingof@gmail.com>
# License: http://snmplabs.com/pyasn1/license.html
#
-import sys
import math
import pickle
+import sys
try:
import unittest2 as unittest
diff --git a/tests/type/test_useful.py b/tests/type/test_useful.py
index 7c13bea..c480f43 100644
--- a/tests/type/test_useful.py
+++ b/tests/type/test_useful.py
@@ -4,10 +4,10 @@
# Copyright (c) 2005-2017, Ilya Etingof <etingof@gmail.com>
# License: http://snmplabs.com/pyasn1/license.html
#
-import sys
import datetime
-from copy import deepcopy
import pickle
+import sys
+from copy import deepcopy
try:
import unittest2 as unittest
@@ -19,6 +19,7 @@ from tests.base import BaseTestCase
from pyasn1.type import useful
+
class FixedOffset(datetime.tzinfo):
def __init__(self, offset, name):
self.__offset = datetime.timedelta(minutes=offset)