diff options
| author | Ilya Etingof <etingof@gmail.com> | 2017-09-15 16:55:16 +0200 |
|---|---|---|
| committer | Ilya Etingof <etingof@gmail.com> | 2017-09-15 21:54:32 +0200 |
| commit | e337ff621e43666fc707600c7601d154dd799d08 (patch) | |
| tree | 89478769ad51608bc2404fc582cadcea94f1e68e /pyasn1/codec | |
| parent | 218acc52cd4574df07536e1bc81bc1eb7a410573 (diff) | |
| download | pyasn1-e337ff621e43666fc707600c7601d154dd799d08.tar.gz | |
run unit tests with full debugging enabled (and ignored)
Also fixed a couple of crashes in debug messages
Diffstat (limited to 'pyasn1/codec')
| -rw-r--r-- | pyasn1/codec/ber/decoder.py | 2 | ||||
| -rw-r--r-- | pyasn1/codec/ber/encoder.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pyasn1/codec/ber/decoder.py b/pyasn1/codec/ber/decoder.py index 3c3be9c..ee3064f 100644 --- a/pyasn1/codec/ber/decoder.py +++ b/pyasn1/codec/ber/decoder.py @@ -1160,7 +1160,7 @@ class Decoder(object): **options ) 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>')) + logger('codec %s yields type %s, value:\n%s\n...remaining substrate is: %s' % (concreteDecoder.__class__.__name__, value.__class__.__name__, isinstance(value, base.Asn1Item) and value.prettyPrint() or value, substrate and debug.hexdump(substrate) or '<none>')) state = stStop break if state is stTryAsExplicitTag: diff --git a/pyasn1/codec/ber/encoder.py b/pyasn1/codec/ber/encoder.py index e52bb49..3ac2ef8 100644 --- a/pyasn1/codec/ber/encoder.py +++ b/pyasn1/codec/ber/encoder.py @@ -476,7 +476,7 @@ class Encoder(object): 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())) + logger('encoder called in %sdef mode, chunk size %s for type %s, value:\n%s' % (not options.get('defMode', True) and 'in' or '', options.get('maxChunkSize', 0), value.prettyPrintType(), value.prettyPrint())) if self.fixedDefLengthMode is not None: options.update(defMode=self.fixedDefLengthMode) |