Possible TypeError under Py2

[pyderasn.git] / pyderasn.py

diff --git a/pyderasn.py b/pyderasn.py
index 104ad3193641142ef1ae8c69d47281a0308eb36d..b9bc9dae515564a24dcc052005754d54993fca03 100755 (executable)
--- a/pyderasn.py
+++ b/pyderasn.py
@@ -3529,7 +3529,7 @@ class UTCTime(CommonString):
             if len(value_decoded) == LEN_YYMMDDHHMMSSZ:
                 try:
                     datetime.strptime(value_decoded, self.fmt)
-                except ValueError:
+                except (TypeError, ValueError):
                     raise DecodeError("invalid UTCTime format")
                 return value
             else:
@@ -3630,7 +3630,7 @@ class GeneralizedTime(UTCTime):
             if len(value_decoded) == LEN_YYYYMMDDHHMMSSZ:
                 try:
                     datetime.strptime(value_decoded, self.fmt)
-                except ValueError:
+                except (TypeError, ValueError):
                     raise DecodeError(
                         "invalid GeneralizedTime (without ms) format",
                     )
@@ -3638,7 +3638,7 @@ class GeneralizedTime(UTCTime):
             elif len(value_decoded) >= LEN_YYYYMMDDHHMMSSDMZ:
                 try:
                     datetime.strptime(value_decoded, self.fmt_ms)
-                except ValueError:
+                except (TypeError, ValueError):
                     raise DecodeError(
                         "invalid GeneralizedTime (with ms) format",
                     )