diff options
author | Ilya Etingof <etingof@gmail.com> | 2019-11-23 09:57:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-23 09:57:24 +0100 |
commit | 2b646e07d5d83f0892fa2a809ae4c981430cb12c (patch) | |
tree | 20b10450bced84c425ca0735b4ee7202e68ee1ec /pyasn1/codec/native/encoder.py | |
parent | 788af3c44edc2ebd079eda3f7a4ae2f9931446fd (diff) | |
parent | f10434e31f9293c4e739ac6c5d1519f407bd1540 (diff) | |
download | pyasn1-git-2b646e07d5d83f0892fa2a809ae4c981430cb12c.tar.gz |
Merge branch 'master' into streamoptimum37
Diffstat (limited to 'pyasn1/codec/native/encoder.py')
-rw-r--r-- | pyasn1/codec/native/encoder.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pyasn1/codec/native/encoder.py b/pyasn1/codec/native/encoder.py index 7c5edc9..6b8ca6d 100644 --- a/pyasn1/codec/native/encoder.py +++ b/pyasn1/codec/native/encoder.py @@ -4,11 +4,7 @@ # Copyright (c) 2005-2019, Ilya Etingof <etingof@gmail.com> # License: http://snmplabs.com/pyasn1/license.html # -try: - from collections import OrderedDict - -except ImportError: - OrderedDict = dict +from collections import OrderedDict from pyasn1 import debug from pyasn1 import error @@ -242,8 +238,7 @@ class Encoder(object): #: of those. #: #: One exception is that instead of :py:class:`dict`, the :py:class:`OrderedDict` -#: can be produced (whenever available) to preserve ordering of the components -#: in ASN.1 SEQUENCE. +#: is used to preserve ordering of the components in ASN.1 SEQUENCE. #: #: Parameters #: ---------- |