summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelie <elie>2013-09-01 19:56:20 +0000
committerelie <elie>2013-09-01 19:56:20 +0000
commitd39d3052079f3373c853a0fdfac4a30a9ffb1e8f (patch)
tree5c5a1e811f5d42a016eeb1900316aa109fa44555
parenta8bc9a468c0743bc83612885c3cfcf9b9c6f21d2 (diff)
downloadpyasn1-d39d3052079f3373c853a0fdfac4a30a9ffb1e8f.tar.gz
T61String & VisibleString types added
-rw-r--r--pyasn1/type/char.py16
1 files changed, 10 insertions, 6 deletions
diff --git a/pyasn1/type/char.py b/pyasn1/type/char.py
index 8cfae10..af49ab3 100644
--- a/pyasn1/type/char.py
+++ b/pyasn1/type/char.py
@@ -1,12 +1,6 @@
# ASN.1 "character string" types
from pyasn1.type import univ, tag
-class UTF8String(univ.OctetString):
- tagSet = univ.OctetString.tagSet.tagImplicitly(
- tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 12)
- )
- encoding = "utf-8"
-
class NumericString(univ.OctetString):
tagSet = univ.OctetString.tagSet.tagImplicitly(
tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 18)
@@ -22,6 +16,8 @@ class TeletexString(univ.OctetString):
tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 20)
)
+class T61String(TeletexString): pass
+
class VideotexString(univ.OctetString):
tagSet = univ.OctetString.tagSet.tagImplicitly(
tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 21)
@@ -42,6 +38,8 @@ class VisibleString(univ.OctetString):
tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 26)
)
+class ISO646String(VisibleString): pass
+
class GeneralString(univ.OctetString):
tagSet = univ.OctetString.tagSet.tagImplicitly(
tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 27)
@@ -58,3 +56,9 @@ class BMPString(univ.OctetString):
tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 30)
)
encoding = "utf-16-be"
+
+class UTF8String(univ.OctetString):
+ tagSet = univ.OctetString.tagSet.tagImplicitly(
+ tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 12)
+ )
+ encoding = "utf-8"