Merge branch 'master' into open-types-support

7 files changed, 82 insertions, 62 deletions

diff --git a/.gitignore b/.gitignore
index 8541d92..9dc2cf5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,6 @@ MANIFEST
 dist/
 build/
 pyasn1.egg-info/
+venv
+venv2
+venv3
diff --git a/CHANGES.rst b/CHANGES.rst
index ce97e34..4d9d6e3 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -41,7 +41,7 @@ Revision 0.2.4, released XX-03-2017
   objects for chunks of substrate. Instead they now join substrate
   chunks together and create ASN.1 object from it just once.
 - Fixed BitString named bits initialization bug.
-- Fixed non-functional tag cache (when running Python 2) at DEB decoder.
+- Fixed non-functional tag cache (when running Python 2) at DER decoder.
 - Fixed chunked encoding restriction on DER encoder.
 
 Revision 0.2.3, released 25-02-2017
diff --git a/pyasn1/codec/ber/decoder.py b/pyasn1/codec/ber/decoder.py
index 46f861d..79a38cf 100644
--- a/pyasn1/codec/ber/decoder.py
+++ b/pyasn1/codec/ber/decoder.py
@@ -787,22 +787,28 @@ class Decoder(object):
     def __call__(self, substrate, asn1Spec=None, tagSet=None,
                  length=None, state=stDecodeTag, recursiveFlag=True,
                  substrateFun=None, allowEoo=False):
-        if debug.logger and debug.logger & debug.flagDecoder:
-            debug.logger('decoder called at scope %s with state %d, working with up to %d octets of substrate: %s' % (debug.scope, state, len(substrate), debug.hexdump(substrate)))
+        if debug.logger & debug.flagDecoder:
+            logger = debug.logger
+        else:
+            logger = None
+
+        if logger:
+            logger('decoder called at scope %s with state %d, working with up to %d octets of substrate: %s' % (debug.scope, state, len(substrate), debug.hexdump(substrate)))
 
         substrate = ensureString(substrate)
 
         # Look for end-of-octets sentinel
         if allowEoo and self.supportIndefLength:
             if substrate.startswith(self.__eooSentinel):
-                debug.logger and debug.logger & debug.flagDecoder and debug.logger('end-of-octets sentinel found')
+                if logger:
+                    logger('end-of-octets sentinel found')
                 return eoo.endOfOctets, substrate[2:]
 
         value = base.noValue
 
         fullSubstrate = substrate
-        while state != stStop:
-            if state == stDecodeTag:
+        while not state is stStop:
+            if state is stDecodeTag:
                 if not substrate:
                     raise error.SubstrateUnderrunError(
                         'Short octet stream on tag decoding'
@@ -854,9 +860,9 @@ class Decoder(object):
                 else:
                     tagSet = lastTag + tagSet
                 state = stDecodeLength
-                debug.logger and debug.logger & debug.flagDecoder and debug.logger(
-                    'tag decoded into %s, decoding length' % tagSet)
-            if state == stDecodeLength:
+                if logger:
+                    logger('tag decoded into %s, decoding length' % tagSet)
+            if state is stDecodeLength:
                 # Decode length
                 if not substrate:
                     raise error.SubstrateUnderrunError(
@@ -892,10 +898,9 @@ class Decoder(object):
                     if len(substrate) < length:
                         raise error.SubstrateUnderrunError('%d-octet short' % (length - len(substrate)))
                 state = stGetValueDecoder
-                debug.logger and debug.logger & debug.flagDecoder and debug.logger(
-                    'value length decoded into %d, payload substrate is: %s' % (length, debug.hexdump(length == -1 and substrate or substrate[:length]))
-                )
-            if state == stGetValueDecoder:
+                if logger:
+                    logger('value length decoded into %d, payload substrate is: %s' % (length, debug.hexdump(length == -1 and substrate or substrate[:length])))
+            if state is stGetValueDecoder:
                 if asn1Spec is None:
                     state = stGetValueDecoderByTag
                 else:
@@ -916,7 +921,7 @@ class Decoder(object):
             # EXPLICIT tag which is most basic). Outermost tag comes first
             # from the wire.
             #
-            if state == stGetValueDecoderByTag:
+            if state is stGetValueDecoderByTag:
                 try:
                     concreteDecoder = self.__tagMap[tagSet]
                 except KeyError:
@@ -932,30 +937,29 @@ class Decoder(object):
                         state = stDecodeValue
                     else:
                         state = stTryAsExplicitTag
-                if debug.logger and debug.logger & debug.flagDecoder:
-                    debug.logger('codec %s chosen by a built-in type, decoding %s' % (concreteDecoder and concreteDecoder.__class__.__name__ or "<none>", state == stDecodeValue and 'value' or 'as explicit tag'))
-                    debug.scope.push(
-                        concreteDecoder is None and '?' or concreteDecoder.protoComponent.__class__.__name__)
-            if state == stGetValueDecoderByAsn1Spec:
+                if logger:
+                    logger('codec %s chosen by a built-in type, decoding %s' % (concreteDecoder and concreteDecoder.__class__.__name__ or "<none>", state is stDecodeValue and 'value' or 'as explicit tag'))
+                    debug.scope.push(concreteDecoder is None and '?' or concreteDecoder.protoComponent.__class__.__name__)
+            if state is stGetValueDecoderByAsn1Spec:
                 if asn1Spec.__class__ is dict or asn1Spec.__class__ is tagmap.TagMap:
                     try:
                         chosenSpec = asn1Spec[tagSet]
                     except KeyError:
                         chosenSpec = None
-                    if debug.logger and debug.logger & debug.flagDecoder:
-                        debug.logger('candidate ASN.1 spec is a map of:')
+                    if logger:
+                        logger('candidate ASN.1 spec is a map of:')
                         for firstOctet, v in asn1Spec.presentTypes.items():
-                            debug.logger('  %s -> %s' % (firstOctet, v.__class__.__name__))
+                            logger('  %s -> %s' % (firstOctet, v.__class__.__name__))
                         if asn1Spec.skipTypes:
-                            debug.logger('but neither of: ')
+                            logger('but neither of: ')
                             for firstOctet, v in asn1Spec.skipTypes.items():
-                                debug.logger('  %s -> %s' % (firstOctet, v.__class__.__name__))
-                        debug.logger('new candidate ASN.1 spec is %s, chosen by %s' % (chosenSpec is None and '<none>' or chosenSpec.prettyPrintType(), tagSet))
+                                logger('  %s -> %s' % (firstOctet, v.__class__.__name__))
+                        logger('new candidate ASN.1 spec is %s, chosen by %s' % (chosenSpec is None and '<none>' or chosenSpec.prettyPrintType(), tagSet))
                 else:
                     if tagSet == asn1Spec.tagSet or tagSet in asn1Spec.tagMap:
                         chosenSpec = asn1Spec
-                        debug.logger and debug.logger & debug.flagDecoder and debug.logger(
-                            'candidate ASN.1 spec is %s' % asn1Spec.__class__.__name__)
+                        if logger:
+                            logger('candidate ASN.1 spec is %s' % asn1Spec.__class__.__name__)
                     else:
                         chosenSpec = None
 
@@ -963,16 +967,16 @@ class Decoder(object):
                     try:
                         # ambiguous type or just faster codec lookup
                         concreteDecoder = self.__typeMap[chosenSpec.typeId]
-                        debug.logger and debug.logger & debug.flagDecoder and debug.logger(
-                            'value decoder chosen for an ambiguous type by type ID %s' % (chosenSpec.typeId,))
+                        if logger:
+                            logger('value decoder chosen for an ambiguous type by type ID %s' % (chosenSpec.typeId,))
                     except KeyError:
                         # use base type for codec lookup to recover untagged types
                         baseTagSet = tag.TagSet(chosenSpec.tagSet.baseTag,  chosenSpec.tagSet.baseTag)
                         try:
                             # base type or tagged subtype
                             concreteDecoder = self.__tagMap[baseTagSet]
-                            debug.logger and debug.logger & debug.flagDecoder and debug.logger(
-                                'value decoder chosen by base %s' % (baseTagSet,))
+                            if logger:
+                                logger('value decoder chosen by base %s' % (baseTagSet,))
                         except KeyError:
                             concreteDecoder = None
                     if concreteDecoder:
@@ -983,10 +987,10 @@ class Decoder(object):
                 else:
                     concreteDecoder = None
                     state = stTryAsExplicitTag
-                if debug.logger and debug.logger & debug.flagDecoder:
-                    debug.logger('codec %s chosen by ASN.1 spec, decoding %s' % (state == stDecodeValue and concreteDecoder.__class__.__name__ or "<none>", state == stDecodeValue and 'value' or 'as explicit tag'))
+                if logger:
+                    logger('codec %s chosen by ASN.1 spec, decoding %s' % (state is stDecodeValue and concreteDecoder.__class__.__name__ or "<none>", state is stDecodeValue and 'value' or 'as explicit tag'))
                     debug.scope.push(chosenSpec is None and '?' or chosenSpec.__class__.__name__)
-            if state == stTryAsExplicitTag:
+            if state is stTryAsExplicitTag:
                 if tagSet and tagSet[0].tagFormat == tag.tagFormatConstructed and tagSet[0].tagClass != tag.tagClassUniversal:
                     # Assume explicit tagging
                     concreteDecoder = explicitTagDecoder
@@ -994,13 +998,14 @@ class Decoder(object):
                 else:
                     concreteDecoder = None
                     state = self.defaultErrorState
-                debug.logger and debug.logger & debug.flagDecoder and debug.logger('codec %s chosen, decoding %s' % (concreteDecoder and concreteDecoder.__class__.__name__ or "<none>", state == stDecodeValue and 'value' or 'as failure'))
-            if state == stDumpRawValue:
+                if logger:
+                    logger('codec %s chosen, decoding %s' % (concreteDecoder and concreteDecoder.__class__.__name__ or "<none>", state is stDecodeValue and 'value' or 'as failure'))
+            if state is stDumpRawValue:
                 concreteDecoder = self.defaultRawDecoder
-                debug.logger and debug.logger & debug.flagDecoder and debug.logger(
-                    'codec %s chosen, decoding value' % concreteDecoder.__class__.__name__)
+                if logger:
+                    logger('codec %s chosen, decoding value' % concreteDecoder.__class__.__name__)
                 state = stDecodeValue
-            if state == stDecodeValue:
+            if state is stDecodeValue:
                 if not recursiveFlag and not substrateFun:  # legacy
                     def substrateFun(a, b, c):
                         return a, b[:c]
@@ -1015,15 +1020,15 @@ class Decoder(object):
                         stGetValueDecoder, self, substrateFun
                     )
                 state = stStop
-                debug.logger and debug.logger & debug.flagDecoder and debug.logger(
-                    'codec %s yields type %s, value:\n%s\n...remaining substrate is: %s' % (concreteDecoder.__class__.__name__, value.__class__.__name__, value.prettyPrint(), substrate and debug.hexdump(substrate) or '<none>'))
-            if state == stErrorCondition:
+                if logger:
+                    logger('codec %s yields type %s, value:\n%s\n...remaining substrate is: %s' % (concreteDecoder.__class__.__name__, value.__class__.__name__, value.prettyPrint(), substrate and debug.hexdump(substrate) or '<none>'))
+            if state is stErrorCondition:
                 raise error.PyAsn1Error(
                     '%s not in asn1Spec: %r' % (tagSet, asn1Spec)
                 )
-        if debug.logger and debug.logger & debug.flagDecoder:
+        if logger:
             debug.scope.pop()
-            debug.logger('decoder left scope %s, call completed' % debug.scope)
+            logger('decoder left scope %s, call completed' % debug.scope)
         return value, substrate
 
 
diff --git a/pyasn1/codec/ber/encoder.py b/pyasn1/codec/ber/encoder.py
index 2bf2bc7..189fd7f 100644
--- a/pyasn1/codec/ber/encoder.py
+++ b/pyasn1/codec/ber/encoder.py
@@ -453,9 +453,12 @@ class Encoder(object):
     def __call__(self, value, defMode=True, maxChunkSize=0):
         if not defMode and not self.supportIndefLength:
             raise error.PyAsn1Error('Indefinite length encoding not supported by this codec')
-        debug.logger & debug.flagEncoder and debug.logger(
-            'encoder called in %sdef mode, chunk size %s for type %s, value:\n%s' % (
-                not defMode and 'in' or '', maxChunkSize, value.prettyPrintType(), value.prettyPrint()))
+        if debug.logger & debug.flagEncoder:
+            logger = debug.logger
+        else:
+            logger = None
+        if logger:
+            logger('encoder called in %sdef mode, chunk size %s for type %s, value:\n%s' % (not defMode and 'in' or '', maxChunkSize, value.prettyPrintType(), value.prettyPrint()))
         tagSet = value.tagSet
         if len(tagSet) > 1:
             concreteEncoder = explicitlyTaggedItemEncoder
@@ -469,13 +472,13 @@ class Encoder(object):
                     concreteEncoder = self.__tagMap[baseTagSet]
                 except KeyError:
                     raise error.PyAsn1Error('No encoder for %s' % (value,))
-        debug.logger & debug.flagEncoder and debug.logger(
-            'using value codec %s chosen by %s' % (concreteEncoder.__class__.__name__, tagSet))
+            if logger:
+                logger('using value codec %s chosen by %s' % (concreteEncoder.__class__.__name__, tagSet))
         substrate = concreteEncoder.encode(
             self, value, defMode, maxChunkSize
         )
-        debug.logger & debug.flagEncoder and debug.logger(
-            'built %s octets of substrate: %s\nencoder completed' % (len(substrate), debug.hexdump(substrate)))
+        if logger:
+            logger('built %s octets of substrate: %s\nencoder completed' % (len(substrate), debug.hexdump(substrate)))
         return substrate
 
 #: Turns ASN.1 object into BER octet stream.
diff --git a/pyasn1/codec/native/decoder.py b/pyasn1/codec/native/decoder.py
index be75cb8..ad7d8f5 100644
--- a/pyasn1/codec/native/decoder.py
+++ b/pyasn1/codec/native/decoder.py
@@ -132,8 +132,12 @@ class Decoder(object):
 
     def __call__(self, pyObject, asn1Spec):
         if debug.logger & debug.flagDecoder:
+            logger = debug.logger
+        else:
+            logger = None
+        if logger:
             debug.scope.push(type(pyObject).__name__)
-            debug.logger('decoder called at scope %s, working with type %s' % (debug.scope, type(pyObject).__name__))
+            logger('decoder called at scope %s, working with type %s' % (debug.scope, type(pyObject).__name__))
 
         if asn1Spec is None or not isinstance(asn1Spec, base.Asn1Item):
             raise error.PyAsn1Error('asn1Spec is not valid (should be an instance of an ASN.1 Item, not %s)' % asn1Spec.__class__.__name__)
@@ -148,13 +152,13 @@ class Decoder(object):
             except KeyError:
                 raise error.PyAsn1Error('Unknown ASN.1 tag %s' % asn1Spec.tagSet)
 
-        if debug.logger & debug.flagDecoder:
-            debug.logger('calling decoder %s on Python type %s <%s>' % (type(valueDecoder).__name__, type(pyObject).__name__, repr(pyObject)))
+        if logger:
+            logger('calling decoder %s on Python type %s <%s>' % (type(valueDecoder).__name__, type(pyObject).__name__, repr(pyObject)))
 
         value = valueDecoder(pyObject, asn1Spec, self)
 
-        if debug.logger & debug.flagDecoder:
-            debug.logger('decoder %s produced ASN.1 type %s <%s>' % (type(valueDecoder).__name__, type(value).__name__, repr(value)))
+        if logger:
+            logger('decoder %s produced ASN.1 type %s <%s>' % (type(valueDecoder).__name__, type(value).__name__, repr(value)))
             debug.scope.pop()
 
         return value
diff --git a/pyasn1/codec/native/encoder.py b/pyasn1/codec/native/encoder.py
index afeb8ae..80be329 100644
--- a/pyasn1/codec/native/encoder.py
+++ b/pyasn1/codec/native/encoder.py
@@ -159,8 +159,12 @@ class Encoder(object):
             raise error.PyAsn1Error('value is not valid (should be an instance of an ASN.1 Item)')
 
         if debug.logger & debug.flagEncoder:
+            logger = debug.logger
+        else:
+            logger = None
+        if logger:
             debug.scope.push(type(asn1Value).__name__)
-            debug.logger('encoder called for type %s <%s>' % (type(asn1Value).__name__, asn1Value.prettyPrint()))
+            logger('encoder called for type %s <%s>' % (type(asn1Value).__name__, asn1Value.prettyPrint()))
 
         tagSet = asn1Value.tagSet
         if len(tagSet) > 1:
@@ -177,12 +181,13 @@ class Encoder(object):
                 else:
                     raise error.PyAsn1Error('No encoder for %s' % (asn1Value,))
 
-        debug.logger & debug.flagEncoder and debug.logger('using value codec %s chosen by %s' % (type(concreteEncoder).__name__, tagSet))
+        if logger:
+            logger('using value codec %s chosen by %s' % (type(concreteEncoder).__name__, tagSet))
 
         pyObject = concreteEncoder.encode(self, asn1Value)
 
-        if debug.logger & debug.flagEncoder:
-            debug.logger('encoder %s produced: %s' % (type(concreteEncoder).__name__, repr(pyObject)))
+        if logger:
+            logger('encoder %s produced: %s' % (type(concreteEncoder).__name__, repr(pyObject)))
             debug.scope.pop()
 
         return pyObject
diff --git a/setup.py b/setup.py
index 9e05783..02fa21e 100644
--- a/setup.py
+++ b/setup.py
@@ -39,9 +39,9 @@ def howto_install_setuptools():
     print("""
    Error: You need setuptools Python package!
 
-   It's very easy to install it, just type (as root on Linux):
+   It's very easy to install it, just type:
 
-   wget https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py
+   wget https://bootstrap.pypa.io/ez_setup.py
    python ez_setup.py
 
    Then you could make eggs from this package.