diff options
author | Ilya Etingof <etingof@gmail.com> | 2017-07-28 09:46:45 +0200 |
---|---|---|
committer | Ilya Etingof <etingof@gmail.com> | 2017-07-28 09:46:45 +0200 |
commit | ca27eaedcabd03e3e0ac2c5d9f8aa8635734486b (patch) | |
tree | 6a29c6c4e3840e504e9a69d7c2be7089d1d01f7f /pyasn1/type | |
parent | 918abfaf1cf2e0d7086354dc87fa970d2e9141ef (diff) | |
download | pyasn1-ca27eaedcabd03e3e0ac2c5d9f8aa8635734486b.tar.gz |
better wording on ASN.1 types attributes
Diffstat (limited to 'pyasn1/type')
-rw-r--r-- | pyasn1/type/char.py | 22 | ||||
-rw-r--r-- | pyasn1/type/univ.py | 54 |
2 files changed, 38 insertions, 38 deletions
diff --git a/pyasn1/type/char.py b/pyasn1/type/char.py index 48a8272..b95e9a7 100644 --- a/pyasn1/type/char.py +++ b/pyasn1/type/char.py @@ -208,7 +208,7 @@ class AbstractCharacterString(univ.OctetString): class NumericString(AbstractCharacterString): __doc__ = AbstractCharacterString.__doc__ - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.tag.TagSet` object representing ASN.1 tag(s) #: associated with |ASN.1| type. tagSet = AbstractCharacterString.tagSet.tagImplicitly( @@ -223,7 +223,7 @@ class NumericString(AbstractCharacterString): class PrintableString(AbstractCharacterString): __doc__ = AbstractCharacterString.__doc__ - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.tag.TagSet` object representing ASN.1 tag(s) #: associated with |ASN.1| type. tagSet = AbstractCharacterString.tagSet.tagImplicitly( @@ -238,7 +238,7 @@ class PrintableString(AbstractCharacterString): class TeletexString(AbstractCharacterString): __doc__ = AbstractCharacterString.__doc__ - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.tag.TagSet` object representing ASN.1 tag(s) #: associated with |ASN.1| type. tagSet = AbstractCharacterString.tagSet.tagImplicitly( @@ -260,7 +260,7 @@ class T61String(TeletexString): class VideotexString(AbstractCharacterString): __doc__ = AbstractCharacterString.__doc__ - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.tag.TagSet` object representing ASN.1 tag(s) #: associated with |ASN.1| type. tagSet = AbstractCharacterString.tagSet.tagImplicitly( @@ -275,7 +275,7 @@ class VideotexString(AbstractCharacterString): class IA5String(AbstractCharacterString): __doc__ = AbstractCharacterString.__doc__ - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.tag.TagSet` object representing ASN.1 tag(s) #: associated with |ASN.1| type. tagSet = AbstractCharacterString.tagSet.tagImplicitly( @@ -290,7 +290,7 @@ class IA5String(AbstractCharacterString): class GraphicString(AbstractCharacterString): __doc__ = AbstractCharacterString.__doc__ - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.tag.TagSet` object representing ASN.1 tag(s) #: associated with |ASN.1| type. tagSet = AbstractCharacterString.tagSet.tagImplicitly( @@ -305,7 +305,7 @@ class GraphicString(AbstractCharacterString): class VisibleString(AbstractCharacterString): __doc__ = AbstractCharacterString.__doc__ - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.tag.TagSet` object representing ASN.1 tag(s) #: associated with |ASN.1| type. tagSet = AbstractCharacterString.tagSet.tagImplicitly( @@ -326,7 +326,7 @@ class ISO646String(VisibleString): class GeneralString(AbstractCharacterString): __doc__ = AbstractCharacterString.__doc__ - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.tag.TagSet` object representing ASN.1 tag(s) #: associated with |ASN.1| type. tagSet = AbstractCharacterString.tagSet.tagImplicitly( @@ -341,7 +341,7 @@ class GeneralString(AbstractCharacterString): class UniversalString(AbstractCharacterString): __doc__ = AbstractCharacterString.__doc__ - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.tag.TagSet` object representing ASN.1 tag(s) #: associated with |ASN.1| type. tagSet = AbstractCharacterString.tagSet.tagImplicitly( @@ -356,7 +356,7 @@ class UniversalString(AbstractCharacterString): class BMPString(AbstractCharacterString): __doc__ = AbstractCharacterString.__doc__ - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.tag.TagSet` object representing ASN.1 tag(s) #: associated with |ASN.1| type. tagSet = AbstractCharacterString.tagSet.tagImplicitly( @@ -371,7 +371,7 @@ class BMPString(AbstractCharacterString): class UTF8String(AbstractCharacterString): __doc__ = AbstractCharacterString.__doc__ - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.tag.TagSet` object representing ASN.1 tag(s) #: associated with |ASN.1| type. tagSet = AbstractCharacterString.tagSet.tagImplicitly( diff --git a/pyasn1/type/univ.py b/pyasn1/type/univ.py index e30fbf1..53f45f0 100644 --- a/pyasn1/type/univ.py +++ b/pyasn1/type/univ.py @@ -45,14 +45,14 @@ class Integer(base.AbstractSimpleAsn1Item): : :py:class:`pyasn1.error.PyAsn1Error` On constraint violation or bad initializer. """ - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.tag.TagSet` object representing ASN.1 tag(s) #: associated with |ASN.1| type. tagSet = tag.initTagSet( tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 0x02) ) - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.constraint.ConstraintsIntersection` object #: imposing constraints on |ASN.1| type initialization values. subtypeSpec = constraint.ConstraintsIntersection() @@ -317,14 +317,14 @@ class Integer(base.AbstractSimpleAsn1Item): class Boolean(Integer): __doc__ = Integer.__doc__ - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.tag.TagSet` object representing ASN.1 tag(s) #: associated with |ASN.1| type. tagSet = tag.initTagSet( tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 0x01), ) - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.constraint.ConstraintsIntersection` object #: imposing constraints on |ASN.1| type initialization values. subtypeSpec = Integer.subtypeSpec + constraint.SingleValueConstraint(0, 1) @@ -371,14 +371,14 @@ class BitString(base.AbstractSimpleAsn1Item): : :py:class:`pyasn1.error.PyAsn1Error` On constraint violation or bad initializer. """ - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.tag.TagSet` object representing ASN.1 tag(s) #: associated with |ASN.1| type. tagSet = tag.initTagSet( tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 0x03) ) - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.constraint.ConstraintsIntersection` object #: imposing constraints on |ASN.1| type initialization values. subtypeSpec = constraint.ConstraintsIntersection() @@ -764,14 +764,14 @@ class OctetString(base.AbstractSimpleAsn1Item): : :py:class:`pyasn1.error.PyAsn1Error` On constraint violation or bad initializer. """ - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.tag.TagSet` object representing ASN.1 tag(s) #: associated with |ASN.1| type. tagSet = tag.initTagSet( tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 0x04) ) - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.constraint.ConstraintsIntersection` object #: imposing constraints on |ASN.1| type initialization values. subtypeSpec = constraint.ConstraintsIntersection() @@ -1110,7 +1110,7 @@ class Null(OctetString): """ defaultValue = ''.encode() # This is tightly constrained - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.tag.TagSet` object representing ASN.1 tag(s) #: associated with |ASN.1| type. tagSet = tag.initTagSet( @@ -1202,14 +1202,14 @@ class ObjectIdentifier(base.AbstractSimpleAsn1Item): : :py:class:`pyasn1.error.PyAsn1Error` On constraint violation or bad initializer. """ - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.tag.TagSet` object representing ASN.1 tag(s) #: associated with |ASN.1| type. tagSet = tag.initTagSet( tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 0x06) ) - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.constraint.ConstraintsIntersection` object #: imposing constraints on |ASN.1| type initialization values. subtypeSpec = constraint.ConstraintsIntersection() @@ -1342,14 +1342,14 @@ class Real(base.AbstractSimpleAsn1Item): _plusInf = _minusInf = None _inf = () - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.tag.TagSet` object representing ASN.1 tag(s) #: associated with |ASN.1| type. tagSet = tag.initTagSet( tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 0x09) ) - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.constraint.ConstraintsIntersection` object #: imposing constraints on |ASN.1| type initialization values. subtypeSpec = constraint.ConstraintsIntersection() @@ -1642,14 +1642,14 @@ class Real(base.AbstractSimpleAsn1Item): class Enumerated(Integer): __doc__ = Integer.__doc__ - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.tag.TagSet` object representing ASN.1 tag(s) #: associated with |ASN.1| type. tagSet = tag.initTagSet( tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 0x0A) ) - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.constraint.ConstraintsIntersection` object #: imposing constraints on |ASN.1| type initialization values. subtypeSpec = constraint.ConstraintsIntersection() @@ -1886,7 +1886,7 @@ class SequenceOfAndSetOfBase(base.AbstractConstructedAsn1Item): class SequenceOf(SequenceOfAndSetOfBase): __doc__ = SequenceOfAndSetOfBase.__doc__ - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.tag.TagSet` object representing ASN.1 tag(s) #: associated with |ASN.1| type. tagSet = tag.initTagSet( @@ -1897,7 +1897,7 @@ class SequenceOf(SequenceOfAndSetOfBase): #: object representing ASN.1 type allowed within |ASN.1| type componentType = None - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.constraint.ConstraintsIntersection` object #: imposing constraints on |ASN.1| type initialization values. subtypeSpec = constraint.ConstraintsIntersection() @@ -1913,7 +1913,7 @@ class SequenceOf(SequenceOfAndSetOfBase): class SetOf(SequenceOfAndSetOfBase): __doc__ = SequenceOfAndSetOfBase.__doc__ - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.tag.TagSet` object representing ASN.1 tag(s) #: associated with |ASN.1| type. tagSet = tag.initTagSet( @@ -1924,7 +1924,7 @@ class SetOf(SequenceOfAndSetOfBase): #: object representing ASN.1 type allowed within |ASN.1| type componentType = None - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.constraint.ConstraintsIntersection` object #: imposing constraints on |ASN.1| type initialization values. subtypeSpec = constraint.ConstraintsIntersection() @@ -2262,14 +2262,14 @@ class SequenceAndSetBase(base.AbstractConstructedAsn1Item): class Sequence(SequenceAndSetBase): __doc__ = SequenceAndSetBase.__doc__ - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.tag.TagSet` object representing ASN.1 tag(s) #: associated with |ASN.1| type. tagSet = tag.initTagSet( tag.Tag(tag.tagClassUniversal, tag.tagFormatConstructed, 0x10) ) - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.constraint.ConstraintsIntersection` object #: imposing constraints on |ASN.1| type initialization values. subtypeSpec = constraint.ConstraintsIntersection() @@ -2299,7 +2299,7 @@ class Sequence(SequenceAndSetBase): class Set(SequenceAndSetBase): __doc__ = SequenceAndSetBase.__doc__ - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.tag.TagSet` object representing ASN.1 tag(s) #: associated with |ASN.1| type. tagSet = tag.initTagSet( @@ -2310,7 +2310,7 @@ class Set(SequenceAndSetBase): #: object representing ASN.1 type allowed within |ASN.1| type componentType = namedtype.NamedTypes() - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.constraint.ConstraintsIntersection` object #: imposing constraints on |ASN.1| type initialization values. subtypeSpec = constraint.ConstraintsIntersection() @@ -2410,7 +2410,7 @@ class Set(SequenceAndSetBase): class Choice(Set): __doc__ = Set.__doc__ - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.tag.TagSet` object representing ASN.1 tag(s) #: associated with |ASN.1| type. tagSet = tag.TagSet() # untagged @@ -2419,7 +2419,7 @@ class Choice(Set): #: object representing ASN.1 type allowed within |ASN.1| type componentType = namedtype.NamedTypes() - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.constraint.ConstraintsIntersection` object #: imposing constraints on |ASN.1| type initialization values. subtypeSpec = constraint.ConstraintsIntersection() @@ -2660,12 +2660,12 @@ class Choice(Set): class Any(OctetString): __doc__ = OctetString.__doc__ - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.tag.TagSet` object representing ASN.1 tag(s) #: associated with |ASN.1| type. tagSet = tag.TagSet() # untagged - #: Set (class attribute) or return (class or instance attribute) a + #: Set (on class, not on instance) or return a #: :py:class:`~pyasn1.type.constraint.ConstraintsIntersection` object #: imposing constraints on |ASN.1| type initialization values. subtypeSpec = constraint.ConstraintsIntersection() |