X-Git-Url: http://www.git.cypherpunks.ru/?p=pyderasn.git;a=blobdiff_plain;f=pyderasn.py;h=78080294ec422a7a636503c4cd96e20892764f54;hp=9e94184cd2274311f8a445cea3acd8a1f698c237;hb=8cc4587b4ebd0a488db45dfdf51ce8ebbf562e0b;hpb=58f8218f3a0a7bc77ba5cc7f2696fb214559d3c7 diff --git a/pyderasn.py b/pyderasn.py index 9e94184..7808029 100755 --- a/pyderasn.py +++ b/pyderasn.py @@ -4208,11 +4208,11 @@ class UTCTime(VisibleString): raise ValueError("non UTC timezone") return datetime( 2000 + int(value[:2]), # %y - int(value[2:4]), # %m - int(value[4:6]), # %d - int(value[6:8]), # %H - int(value[8:10]), # %M - int(value[10:12]), # %S + pureint(value[2:4]), # %m + pureint(value[4:6]), # %d + pureint(value[6:8]), # %H + pureint(value[8:10]), # %M + pureint(value[10:12]), # %S ) def _value_sanitize(self, value): @@ -4332,12 +4332,12 @@ class GeneralizedTime(UTCTime): if value[-1] != "Z": raise ValueError("non UTC timezone") return datetime( - int(value[:4]), # %Y - int(value[4:6]), # %m - int(value[6:8]), # %d - int(value[8:10]), # %H - int(value[10:12]), # %M - int(value[12:14]), # %S + pureint(value[:4]), # %Y + pureint(value[4:6]), # %m + pureint(value[6:8]), # %d + pureint(value[8:10]), # %H + pureint(value[10:12]), # %M + pureint(value[12:14]), # %S ) if l >= LEN_YYYYMMDDHHMMSSDMZ: # datetime.strptime's format: %Y%m%d%H%M%S.%fZ @@ -4351,14 +4351,14 @@ class GeneralizedTime(UTCTime): us_len = len(us) if us_len > 6: raise ValueError("only microsecond fractions are supported") - us = int(us + ("0" * (6 - us_len))) + us = pureint(us + ("0" * (6 - us_len))) decoded = datetime( - int(value[:4]), # %Y - int(value[4:6]), # %m - int(value[6:8]), # %d - int(value[8:10]), # %H - int(value[10:12]), # %M - int(value[12:14]), # %S + pureint(value[:4]), # %Y + pureint(value[4:6]), # %m + pureint(value[6:8]), # %d + pureint(value[8:10]), # %H + pureint(value[10:12]), # %M + pureint(value[12:14]), # %S us, # %f ) return decoded