Improve open maps debugging in decoder

etingof · Sep 7, 2019 · bac135a · bac135a
1 parent aa5eb55
commit bac135a
Showing 1 changed file with 30 additions and 2 deletions.
diff --git a/pyasn1/codec/ber/decoder.py b/pyasn1/codec/ber/decoder.py
@@ -638,7 +638,10 @@ def valueDecoder(self, substrate, asn1Spec,
                     openTypes = options.get('openTypes', {})
 
                     if LOG:
-                        LOG('using open types map: %r' % openTypes)
+                        LOG('user-specified open types map:')
+
+                        for k, v in openTypes.items():
+                            LOG('%s -> %r' % (k, v))
 
                     if openTypes or options.get('decodeOpenTypes', False):
 
@@ -658,6 +661,17 @@ def valueDecoder(self, substrate, asn1Spec,
 
                             except KeyError:
 
+                                if LOG:
+                                    LOG('default open types map of component '
+                                        '"%s.%s" governed by component "%s.%s"'
+                                        ':' % (asn1Object.__class__.__name__,
+                                               namedType.name,
+                                               asn1Object.__class__.__name__,
+                                               namedType.openType.name))
+
+                                    for k, v in namedType.openType.items():
+                                        LOG('%s -> %r' % (k, v))
+
                                 try:
                                     openType = namedType.openType[governingValue]
 
@@ -823,7 +837,10 @@ def indefLenValueDecoder(self, substrate, asn1Spec,
                     openTypes = options.get('openTypes', {})
 
                     if LOG:
-                        LOG('using open types map: %r' % openTypes)
+                        LOG('user-specified open types map:')
+
+                        for k, v in openTypes.items():
+                            LOG('%s -> %r' % (k, v))
 
                     if openTypes or options.get('decodeOpenTypes', False):
 
@@ -843,6 +860,17 @@ def indefLenValueDecoder(self, substrate, asn1Spec,
 
                             except KeyError:
 
+                                if LOG:
+                                    LOG('default open types map of component '
+                                        '"%s.%s" governed by component "%s.%s"'
+                                        ':' % (asn1Object.__class__.__name__,
+                                               namedType.name,
+                                               asn1Object.__class__.__name__,
+                                               namedType.openType.name))
+
+                                    for k, v in namedType.openType.items():
+                                        LOG('%s -> %r' % (k, v))
+
                                 try:
                                     openType = namedType.openType[governingValue]