summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelie <elie>2013-06-02 21:10:54 +0000
committerelie <elie>2013-06-02 21:10:54 +0000
commit32e6144bb3709695d4314b31e371f5cdf5ab8c9a (patch)
tree0c96d00e659f183c5fa3f00bd19d2acdb7c0746f
parent054a4187b095dfb2184253f0498a298b7408ef72 (diff)
downloadpyasn1-32e6144bb3709695d4314b31e371f5cdf5ab8c9a.tar.gz
minor fixes as reported by pylint
-rw-r--r--pyasn1/__init__.py2
-rw-r--r--pyasn1/codec/ber/decoder.py14
-rw-r--r--pyasn1/codec/der/decoder.py1
-rw-r--r--pyasn1/type/base.py4
4 files changed, 10 insertions, 11 deletions
diff --git a/pyasn1/__init__.py b/pyasn1/__init__.py
index 9817cd0..77793cd 100644
--- a/pyasn1/__init__.py
+++ b/pyasn1/__init__.py
@@ -4,5 +4,5 @@ import sys
__version__ = '0.1.8'
if sys.version_info[:2] < (2, 4):
- raise RuntimeError('PyASN1 requires Python 2.4 or later')
+ raise RuntimeError('PyASN1 requires Python 2.4 or later')
diff --git a/pyasn1/codec/ber/decoder.py b/pyasn1/codec/ber/decoder.py
index be0cf49..6e66044 100644
--- a/pyasn1/codec/ber/decoder.py
+++ b/pyasn1/codec/ber/decoder.py
@@ -1,7 +1,7 @@
# BER decoder
-from pyasn1.type import tag, base, univ, char, useful, tagmap
+from pyasn1.type import tag, univ, char, useful, tagmap
from pyasn1.codec.ber import eoo
-from pyasn1.compat.octets import oct2int, octs2ints, isOctetsType
+from pyasn1.compat.octets import oct2int, isOctetsType
from pyasn1 import debug, error
class AbstractDecoder:
@@ -11,7 +11,7 @@ class AbstractDecoder:
raise error.PyAsn1Error('Decoder not implemented for %s' % (tagSet,))
def indefLenValueDecoder(self, fullSubstrate, substrate, asn1Spec, tagSet,
- length, state, decodeFun, substrateFun):
+ length, state, decodeFun, substrateFun):
raise error.PyAsn1Error('Indefinite length mode decoder not implemented for %s' % (tagSet,))
class AbstractSimpleDecoder(AbstractDecoder):
@@ -641,9 +641,9 @@ class Decoder:
if state == stDecodeLength:
# Decode length
if not substrate:
- raise error.SubstrateUnderrunError(
- 'Short octet stream on length decoding'
- )
+ raise error.SubstrateUnderrunError(
+ 'Short octet stream on length decoding'
+ )
firstOctet = oct2int(substrate[0])
if firstOctet == 128:
size = 1
@@ -725,7 +725,7 @@ class Decoder:
debug.logger(' %r -> %s' % (t, v.__class__.__name__))
if asn1Spec.getNegMap():
debug.logger('but neither of: ')
- for i in asn1Spec.getNegMap().items():
+ for t, v in asn1Spec.getNegMap().items():
debug.logger(' %r -> %s' % (t, v.__class__.__name__))
debug.logger('new candidate ASN.1 spec is %s, chosen by %r' % (__chosenSpec is None and '<none>' or __chosenSpec.__class__.__name__, tagSet))
else:
diff --git a/pyasn1/codec/der/decoder.py b/pyasn1/codec/der/decoder.py
index 604abec..1ecdf5c 100644
--- a/pyasn1/codec/der/decoder.py
+++ b/pyasn1/codec/der/decoder.py
@@ -1,5 +1,4 @@
# DER decoder
-from pyasn1.type import univ
from pyasn1.codec.cer import decoder
tagMap = decoder.tagMap
diff --git a/pyasn1/type/base.py b/pyasn1/type/base.py
index 4087371..6c7eeec 100644
--- a/pyasn1/type/base.py
+++ b/pyasn1/type/base.py
@@ -1,13 +1,13 @@
# Base classes for ASN.1 types
import sys
-from pyasn1.type import constraint, tagmap
+from pyasn1.type import constraint, tagmap, tag
from pyasn1 import error
class Asn1Item: pass
class Asn1ItemBase(Asn1Item):
# Set of tags for this ASN.1 type
- tagSet = ()
+ tagSet = tag.TagSet()
# A list of constraint.Constraint instances for checking values
subtypeSpec = constraint.ConstraintsIntersection()