summaryrefslogtreecommitdiff
path: root/pyasn1/compat
diff options
context:
space:
mode:
authorelie <elie>2015-09-10 19:59:23 +0000
committerelie <elie>2015-09-10 19:59:23 +0000
commit8b721d294ab99f55b9ff670b53bc1e5d1920b37c (patch)
tree7b0ac84aa482f319f4122ebeb8124380b523786e /pyasn1/compat
parent3796e0b2b2678be1ad9b40ed0c06c6e19800ce66 (diff)
downloadpyasn1-8b721d294ab99f55b9ff670b53bc1e5d1920b37c.tar.gz
fix to ObjectIdentifier initialization from unicode string
Diffstat (limited to 'pyasn1/compat')
-rw-r--r--pyasn1/compat/octets.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/pyasn1/compat/octets.py b/pyasn1/compat/octets.py
index f7f2a29..e812737 100644
--- a/pyasn1/compat/octets.py
+++ b/pyasn1/compat/octets.py
@@ -9,6 +9,7 @@ if version_info[0] <= 2:
str2octs = lambda x: x
octs2str = lambda x: x
isOctetsType = lambda s: isinstance(s, str)
+ isStringType = lambda s: isinstance(s, (str, unicode))
else:
ints2octs = bytes
int2oct = lambda x: ints2octs((x,))
@@ -18,3 +19,4 @@ else:
str2octs = lambda x: x.encode()
octs2str = lambda x: x.decode()
isOctetsType = lambda s: isinstance(s, bytes)
+ isStringType = lambda s: isinstance(s, str)