summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-10-24 09:09:55 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-10-24 09:09:55 -0500
commit8d887e14eedef77f37f6de2b98a995c1cc14eea1 (patch)
tree13ca84d301a67f1e6aa5202e9bf4e5168fbc8a67 /src
parent5d5d28d13a0843b268e29f1cc2a06a7ccbef73f0 (diff)
downloadpyopenssl-8d887e14eedef77f37f6de2b98a995c1cc14eea1.tar.gz
fix review issues
Diffstat (limited to 'src')
-rw-r--r--src/OpenSSL/crypto.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/OpenSSL/crypto.py b/src/OpenSSL/crypto.py
index b75fa8b..71b6c51 100644
--- a/src/OpenSSL/crypto.py
+++ b/src/OpenSSL/crypto.py
@@ -1,5 +1,6 @@
import datetime
-from time import mktime, time
+
+from time import mktime
from base64 import b16encode
from functools import partial
from operator import __eq__, __ne__, __lt__, __le__, __gt__, __ge__
@@ -1209,7 +1210,7 @@ class X509(object):
:py:const:`False` otherwise.
:rtype: :py:class:`bool`
"""
- time_string = self.get_notAfter()
+ time_string = _native(self.get_notAfter())
timestamp = mktime(datetime.datetime.strptime(
time_string, "%Y%m%d%H%M%SZ").timetuple())
now = mktime(datetime.datetime.utcnow().timetuple())