summaryrefslogtreecommitdiffstats
path: root/ipa-server
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2007-11-21 00:27:50 -0500
committerRob Crittenden <rcritten@redhat.com>2007-11-21 00:27:50 -0500
commitd3d89f754b0cb08efa3632d2c0f841b3cbab4188 (patch)
tree12332c037b6ba261a6731ae1a2ed5498250d1e34 /ipa-server
parentbf743087d25e170091dc507fa087d012b64b1468 (diff)
downloadfreeipa-d3d89f754b0cb08efa3632d2c0f841b3cbab4188.tar.gz
freeipa-d3d89f754b0cb08efa3632d2c0f841b3cbab4188.tar.xz
freeipa-d3d89f754b0cb08efa3632d2c0f841b3cbab4188.zip
Use same tzinfo as the time parser to avoid TypeError from being thrown
Diffstat (limited to 'ipa-server')
-rw-r--r--ipa-server/ipa-gui/ipagui/helpers/userhelper.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipa-server/ipa-gui/ipagui/helpers/userhelper.py b/ipa-server/ipa-gui/ipagui/helpers/userhelper.py
index e1ade3a2c..52d37c9e4 100644
--- a/ipa-server/ipa-gui/ipagui/helpers/userhelper.py
+++ b/ipa-server/ipa-gui/ipagui/helpers/userhelper.py
@@ -13,7 +13,7 @@ def password_expires_in(datestr):
if not expdate:
return sys.maxint
- delta = expdate - datetime.datetime.now()
+ delta = expdate - datetime.datetime.now(ipautil.GeneralizedTimeZone())
return delta.days
def password_is_expired(days):