summaryrefslogtreecommitdiff
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
parent3d7f65f52b1a4b38f7ca561d460a78125dd31df1 (diff)
downloadpyasn1-git-d3f166fd034c286a2e7eaff6d690343f4bc7a56c.tar.gz
imports pep8'ed
-rw-r--r--CHANGES.rst13
-rw-r--r--pyasn1/codec/ber/decoder.py13
-rw-r--r--pyasn1/codec/ber/encoder.py13
-rw-r--r--pyasn1/codec/ber/eoo.py5
-rw-r--r--pyasn1/codec/cer/decoder.py4
-rw-r--r--pyasn1/codec/cer/encoder.py6
-rw-r--r--pyasn1/codec/der/decoder.py2
-rw-r--r--pyasn1/codec/der/encoder.py4
-rw-r--r--pyasn1/codec/native/decoder.py9
-rw-r--r--pyasn1/codec/native/encoder.py9
-rw-r--r--pyasn1/compat/dateandtime.py4
-rw-r--r--pyasn1/compat/integer.py2
-rw-r--r--pyasn1/debug.py5
-rw-r--r--pyasn1/type/base.py7
-rw-r--r--pyasn1/type/char.py5
-rw-r--r--pyasn1/type/constraint.py9
-rw-r--r--pyasn1/type/namedtype.py7
-rw-r--r--pyasn1/type/tag.py4
-rw-r--r--pyasn1/type/univ.py21
-rw-r--r--pyasn1/type/useful.py8
-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
34 files changed, 144 insertions, 70 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index eaa6013..27d3067 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,5 +1,5 @@
-Revision 0.4.1, released XX-11-2017
+Revision 0.4.1, released 23-11-2017
-----------------------------------
- ANY DEFINED BY clause support implemented
@@ -14,11 +14,11 @@ Revision 0.4.1, released XX-11-2017
- The ASN.1 types' `__repr__` implementation reworked for better readability
at the cost of not being `eval`-compliant
- Most ASN.1 types' `__str__` magic methods (except for OctetString and
- character types) reworked to call `.prettyPrint()` rather than `.prettyPrint`
- calling `__str__` as it was before. The intention is to eventually deprecate
- `.prettyPrint()` in favor of `str()`.
- The other related change is that `str()` of enumerations and boolean types
- will return string label instead of number.
+ character types) reworked to call `.prettyPrint()` rather than
+ `.prettyPrint` calling `__str__` as it was before. The intention is
+ to eventually deprecate `.prettyPrint()` in favor of `str()`.
+ The other related change is that `str()` of enumerations and boolean
+ types will return string label instead of number.
- Fixed Choice.clear() to fully reset internal state of the object
- Sphinx documentation rearranged, simplified and reworded
- The `isValue` singleton is now the only way to indicate ASN.1 schema
@@ -28,6 +28,7 @@ Revision 0.4.1, released XX-11-2017
value (`''`) is not set anymore. Thus `Null()` call produces a
ASN.1 schema object, while `Null('')` - value object.
- Migrated all docs and references from SourceForge
+- Imports PEP8'ed
- Fixed ASN.1 encoder not to omit empty substrate produced for inner
component if the inner component belongs to the simple class (as
opposed to constructed class)
diff --git a/pyasn1/codec/ber/decoder.py b/pyasn1/codec/ber/decoder.py
index 9c9195c..6e29db0 100644
--- a/pyasn1/codec/ber/decoder.py
+++ b/pyasn1/codec/ber/decoder.py
@@ -4,12 +4,17 @@
# Copyright (c) 2005-2017, Ilya Etingof <etingof@gmail.com>
# License: http://snmplabs.com/pyasn1/license.html
#
-from pyasn1.type import base, tag, univ, char, useful, tagmap
+from pyasn1 import debug
+from pyasn1 import error
from pyasn1.codec.ber import eoo
-from pyasn1.compat.octets import oct2int, octs2ints, ints2octs, null
from pyasn1.compat.integer import from_bytes
-from pyasn1.compat import binary
-from pyasn1 import debug, error
+from pyasn1.compat.octets import oct2int, octs2ints, ints2octs, null
+from pyasn1.type import base
+from pyasn1.type import char
+from pyasn1.type import tag
+from pyasn1.type import tagmap
+from pyasn1.type import univ
+from pyasn1.type import useful
__all__ = ['decode']
diff --git a/pyasn1/codec/ber/encoder.py b/pyasn1/codec/ber/encoder.py
index 5e17c55..1f6c11c 100644
--- a/pyasn1/codec/ber/encoder.py
+++ b/pyasn1/codec/ber/encoder.py
@@ -4,17 +4,22 @@
# Copyright (c) 2005-2017, Ilya Etingof <etingof@gmail.com>
# License: http://snmplabs.com/pyasn1/license.html
#
-from pyasn1.type import tag, univ, char, useful
+from pyasn1 import debug
+from pyasn1 import error
from pyasn1.codec.ber import eoo
-from pyasn1.compat.octets import int2oct, oct2int, ints2octs, null, str2octs, isOctetsType
from pyasn1.compat.integer import to_bytes
-from pyasn1 import debug, error
+from pyasn1.compat.octets import (int2oct, oct2int, ints2octs, null,
+ str2octs, isOctetsType)
+from pyasn1.type import char
+from pyasn1.type import tag
+from pyasn1.type import univ
+from pyasn1.type import useful
__all__ = ['encode']
class AbstractItemEncoder(object):
- supportIndefLenMode = 1
+ supportIndefLenMode = True
# An outcome of otherwise legit call `encodeFun(eoo.endOfOctets)`
eooIntegerSubstrate = (0, 0)
diff --git a/pyasn1/codec/ber/eoo.py b/pyasn1/codec/ber/eoo.py
index 7c40726..044e2df 100644
--- a/pyasn1/codec/ber/eoo.py
+++ b/pyasn1/codec/ber/eoo.py
@@ -4,7 +4,10 @@
# Copyright (c) 2005-2017, Ilya Etingof <etingof@gmail.com>
# License: http://snmplabs.com/pyasn1/license.html
#
-from pyasn1.type import base, tag
+from pyasn1.type import base
+from pyasn1.type import tag
+
+__all__ = ['endOfOctets']
class EndOfOctets(base.AbstractSimpleAsn1Item):
diff --git a/pyasn1/codec/cer/decoder.py b/pyasn1/codec/cer/decoder.py
index 62b1f82..f89e165 100644
--- a/pyasn1/codec/cer/decoder.py
+++ b/pyasn1/codec/cer/decoder.py
@@ -4,10 +4,10 @@
# Copyright (c) 2005-2017, Ilya Etingof <etingof@gmail.com>
# License: http://snmplabs.com/pyasn1/license.html
#
-from pyasn1.type import univ
+from pyasn1 import error
from pyasn1.codec.ber import decoder
from pyasn1.compat.octets import oct2int
-from pyasn1 import error
+from pyasn1.type import univ
__all__ = ['decode']
diff --git a/pyasn1/codec/cer/encoder.py b/pyasn1/codec/cer/encoder.py
index 16c2098..8bf77d2 100644
--- a/pyasn1/codec/cer/encoder.py
+++ b/pyasn1/codec/cer/encoder.py
@@ -4,11 +4,11 @@
# Copyright (c) 2005-2017, Ilya Etingof <etingof@gmail.com>
# License: http://snmplabs.com/pyasn1/license.html
#
-from pyasn1.type import univ
-from pyasn1.type import useful
+from pyasn1 import error
from pyasn1.codec.ber import encoder
from pyasn1.compat.octets import str2octs, null
-from pyasn1 import error
+from pyasn1.type import univ
+from pyasn1.type import useful
__all__ = ['encode']
diff --git a/pyasn1/codec/der/decoder.py b/pyasn1/codec/der/decoder.py
index 751c5dc..7cc4ab5 100644
--- a/pyasn1/codec/der/decoder.py
+++ b/pyasn1/codec/der/decoder.py
@@ -4,8 +4,8 @@
# Copyright (c) 2005-2017, Ilya Etingof <etingof@gmail.com>
# License: http://snmplabs.com/pyasn1/license.html
#
-from pyasn1.type import univ
from pyasn1.codec.cer import decoder
+from pyasn1.type import univ
__all__ = ['decode']
diff --git a/pyasn1/codec/der/encoder.py b/pyasn1/codec/der/encoder.py
index c23b49f..682860b 100644
--- a/pyasn1/codec/der/encoder.py
+++ b/pyasn1/codec/der/encoder.py
@@ -4,9 +4,9 @@
# Copyright (c) 2005-2017, Ilya Etingof <etingof@gmail.com>
# License: http://snmplabs.com/pyasn1/license.html
#
-from pyasn1.type import univ
-from pyasn1.codec.cer import encoder
from pyasn1 import error
+from pyasn1.codec.cer import encoder
+from pyasn1.type import univ
__all__ = ['encode']
diff --git a/pyasn1/codec/native/decoder.py b/pyasn1/codec/native/decoder.py
index 415a185..fe250fb 100644
--- a/pyasn1/codec/native/decoder.py
+++ b/pyasn1/codec/native/decoder.py
@@ -4,8 +4,13 @@
# Copyright (c) 2005-2017, Ilya Etingof <etingof@gmail.com>
# License: http://snmplabs.com/pyasn1/license.html
#
-from pyasn1.type import base, univ, char, useful, tag
-from pyasn1 import debug, error
+from pyasn1 import debug
+from pyasn1 import error
+from pyasn1.type import base
+from pyasn1.type import char
+from pyasn1.type import tag
+from pyasn1.type import univ
+from pyasn1.type import useful
__all__ = ['decode']
diff --git a/pyasn1/codec/native/encoder.py b/pyasn1/codec/native/encoder.py
index 8d4cf6a..9f20fe1 100644
--- a/pyasn1/codec/native/encoder.py
+++ b/pyasn1/codec/native/encoder.py
@@ -10,8 +10,13 @@ try:
except ImportError:
OrderedDict = dict
-from pyasn1.type import base, univ, tag, char, useful
-from pyasn1 import debug, error
+from pyasn1 import debug
+from pyasn1 import error
+from pyasn1.type import base
+from pyasn1.type import char
+from pyasn1.type import tag
+from pyasn1.type import univ
+from pyasn1.type import useful
__all__ = ['encode']
diff --git a/pyasn1/compat/dateandtime.py b/pyasn1/compat/dateandtime.py
index 46c3eb4..abb8754 100644
--- a/pyasn1/compat/dateandtime.py
+++ b/pyasn1/compat/dateandtime.py
@@ -4,9 +4,9 @@
# Copyright (c) 2005-2017, Ilya Etingof <etingof@gmail.com>
# License: http://snmplabs.com/pyasn1/license.html
#
-from sys import version_info
-from datetime import datetime
import time
+from datetime import datetime
+from sys import version_info
__all__ = ['strptime']
diff --git a/pyasn1/compat/integer.py b/pyasn1/compat/integer.py
index 2d903d8..b109340 100644
--- a/pyasn1/compat/integer.py
+++ b/pyasn1/compat/integer.py
@@ -5,8 +5,10 @@
# License: http://snmplabs.com/pyasn1/license.html
#
import sys
+
try:
import platform
+
implementation = platform.python_implementation()
except (ImportError, AttributeError):
diff --git a/pyasn1/debug.py b/pyasn1/debug.py
index d5f87cd..fcf1ae2 100644
--- a/pyasn1/debug.py
+++ b/pyasn1/debug.py
@@ -5,9 +5,10 @@
# License: http://snmplabs.com/pyasn1/license.html
#
import logging
-from pyasn1.compat.octets import octs2ints
-from pyasn1 import error
+
from pyasn1 import __version__
+from pyasn1 import error
+from pyasn1.compat.octets import octs2ints
__all__ = ['Debug', 'setLogger', 'hexdump']
diff --git a/pyasn1/type/base.py b/pyasn1/type/base.py
index 600240a..9f52285 100644
--- a/pyasn1/type/base.py
+++ b/pyasn1/type/base.py
@@ -5,9 +5,12 @@
# License: http://snmplabs.com/pyasn1/license.html
#
import sys
-from pyasn1.type import constraint, tagmap, tag
-from pyasn1.compat import calling
+
from pyasn1 import error
+from pyasn1.compat import calling
+from pyasn1.type import constraint
+from pyasn1.type import tag
+from pyasn1.type import tagmap
__all__ = ['Asn1Item', 'Asn1ItemBase', 'AbstractSimpleAsn1Item', 'AbstractConstructedAsn1Item']
diff --git a/pyasn1/type/char.py b/pyasn1/type/char.py
index 277a8bb..3a29165 100644
--- a/pyasn1/type/char.py
+++ b/pyasn1/type/char.py
@@ -5,9 +5,10 @@
# License: http://snmplabs.com/pyasn1/license.html
#
import sys
-from pyasn1.type import univ, tag
-from pyasn1 import error
+from pyasn1 import error
+from pyasn1.type import tag
+from pyasn1.type import univ
__all__ = ['NumericString', 'PrintableString', 'TeletexString', 'T61String', 'VideotexString',
'IA5String', 'GraphicString', 'VisibleString', 'ISO646String',
diff --git a/pyasn1/type/constraint.py b/pyasn1/type/constraint.py
index e83e480..b5b06cd 100644
--- a/pyasn1/type/constraint.py
+++ b/pyasn1/type/constraint.py
@@ -7,11 +7,14 @@
# Original concept and code by Mike C. Fletcher.
#
import sys
+
from pyasn1.type import error
-__all__ = ['SingleValueConstraint', 'ContainedSubtypeConstraint', 'ValueRangeConstraint',
- 'ValueSizeConstraint', 'PermittedAlphabetConstraint', 'InnerTypeConstraint',
- 'ConstraintsExclusion', 'ConstraintsIntersection', 'ConstraintsUnion']
+__all__ = ['SingleValueConstraint', 'ContainedSubtypeConstraint',
+ 'ValueRangeConstraint', 'ValueSizeConstraint',
+ 'PermittedAlphabetConstraint', 'InnerTypeConstraint',
+ 'ConstraintsExclusion', 'ConstraintsIntersection',
+ 'ConstraintsUnion']
class AbstractConstraint(object):
diff --git a/pyasn1/type/namedtype.py b/pyasn1/type/namedtype.py
index d118de7..93f0b7e 100644
--- a/pyasn1/type/namedtype.py
+++ b/pyasn1/type/namedtype.py
@@ -5,10 +5,13 @@
# License: http://snmplabs.com/pyasn1/license.html
#
import sys
-from pyasn1.type import tag, tagmap
+
from pyasn1 import error
+from pyasn1.type import tag
+from pyasn1.type import tagmap
-__all__ = ['NamedType', 'OptionalNamedType', 'DefaultedNamedType', 'NamedTypes']
+__all__ = ['NamedType', 'OptionalNamedType', 'DefaultedNamedType',
+ 'NamedTypes']
try:
any
diff --git a/pyasn1/type/tag.py b/pyasn1/type/tag.py
index d429c18..b14b5e1 100644
--- a/pyasn1/type/tag.py
+++ b/pyasn1/type/tag.py
@@ -8,8 +8,8 @@ from pyasn1 import error
__all__ = ['tagClassUniversal', 'tagClassApplication', 'tagClassContext',
'tagClassPrivate', 'tagFormatSimple', 'tagFormatConstructed',
- 'tagCategoryImplicit', 'tagCategoryExplicit', 'tagCategoryUntagged',
- 'Tag', 'TagSet']
+ 'tagCategoryImplicit', 'tagCategoryExplicit',
+ 'tagCategoryUntagged', 'Tag', 'TagSet']
#: Identifier for ASN.1 class UNIVERSAL
tagClassUniversal = 0x00
diff --git a/pyasn1/type/univ.py b/pyasn1/type/univ.py
index ef63ba8..fc13705 100644
--- a/pyasn1/type/univ.py
+++ b/pyasn1/type/univ.py
@@ -4,19 +4,28 @@
# Copyright (c) 2005-2017, Ilya Etingof <etingof@gmail.com>
# License: http://snmplabs.com/pyasn1/license.html
#
-import sys
import math
-from pyasn1.type import base, tag, constraint, namedtype, namedval, tagmap
-from pyasn1.codec.ber import eoo
-from pyasn1.compat import octets, integer, binary
+import sys
+
from pyasn1 import error
+from pyasn1.codec.ber import eoo
+from pyasn1.compat import binary
+from pyasn1.compat import integer
+from pyasn1.compat import octets
+from pyasn1.type import base
+from pyasn1.type import constraint
+from pyasn1.type import namedtype
+from pyasn1.type import namedval
+from pyasn1.type import tag
+from pyasn1.type import tagmap
NoValue = base.NoValue
noValue = NoValue()
__all__ = ['Integer', 'Boolean', 'BitString', 'OctetString', 'Null',
- 'ObjectIdentifier', 'Real', 'Enumerated', 'SequenceOfAndSetOfBase', 'SequenceOf',
- 'SetOf', 'SequenceAndSetBase', 'Sequence', 'Set', 'Choice', 'Any',
+ 'ObjectIdentifier', 'Real', 'Enumerated',
+ 'SequenceOfAndSetOfBase', 'SequenceOf', 'SetOf',
+ 'SequenceAndSetBase', 'Sequence', 'Set', 'Choice', 'Any',
'NoValue', 'noValue']
# "Simple" ASN.1 types (yet incomplete)
diff --git a/pyasn1/type/useful.py b/pyasn1/type/useful.py
index 4e36eff..54961d7 100644
--- a/pyasn1/type/useful.py
+++ b/pyasn1/type/useful.py
@@ -5,9 +5,13 @@
# License: http://snmplabs.com/pyasn1/license.html
#
import datetime
-from pyasn1.type import univ, char, tag
-from pyasn1.compat import string, dateandtime
+
from pyasn1 import error
+from pyasn1.compat import dateandtime
+from pyasn1.compat import string
+from pyasn1.type import char
+from pyasn1.type import tag
+from pyasn1.type import univ
__all__ = ['ObjectDescriptor', 'GeneralizedTime', 'UTCTime']
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)