9 files changed, 44 insertions, 21 deletions
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']