diff options
| author | Ilya Etingof <etingof@gmail.com> | 2016-03-27 18:25:49 +0200 |
|---|---|---|
| committer | Ilya Etingof <etingof@gmail.com> | 2016-03-27 18:25:49 +0200 |
| commit | ab226fc7ce4986c51dff117917df8aef54a33d1d (patch) | |
| tree | 2dcd9dc8bd82cebee55584c3bccbbb2675ba722e /pyasn1/compat | |
| parent | e957625d72203e40733631d0833a2365d2696622 (diff) | |
| parent | 03e63a82de21758a897c3da977dd625866586785 (diff) | |
| download | pyasn1-ab226fc7ce4986c51dff117917df8aef54a33d1d.tar.gz | |
Merge branch 'master' into sphinx-docstrings
Conflicts:
pyasn1/type/base.py
pyasn1/type/univ.py
Diffstat (limited to 'pyasn1/compat')
| -rw-r--r-- | pyasn1/compat/octets.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pyasn1/compat/octets.py b/pyasn1/compat/octets.py index aa17562..9e795ae 100644 --- a/pyasn1/compat/octets.py +++ b/pyasn1/compat/octets.py @@ -8,10 +8,10 @@ from sys import version_info if version_info[0] <= 2: int2oct = chr - ints2octs = lambda s: ''.join([ int2oct(x) for x in s ]) + ints2octs = lambda s: ''.join([int2oct(x) for x in s]) null = '' oct2int = ord - octs2ints = lambda s: [ oct2int(x) for x in s ] + octs2ints = lambda s: [oct2int(x) for x in s] str2octs = lambda x: x octs2str = lambda x: x isOctetsType = lambda s: isinstance(s, str) @@ -21,8 +21,8 @@ else: int2oct = lambda x: ints2octs((x,)) null = ints2octs() oct2int = lambda x: x - octs2ints = lambda s: [ x for x in s ] - str2octs = lambda x: x.encode() - octs2str = lambda x: x.decode() + octs2ints = lambda s: [x for x in s] + str2octs = lambda x: x.encode('iso-8859-1') + octs2str = lambda x: x.decode('iso-8859-1') isOctetsType = lambda s: isinstance(s, bytes) isStringType = lambda s: isinstance(s, str) |