From fe8bae82e8d586a99d1975d4e649b5113138e8ac Mon Sep 17 00:00:00 2001 From: Sunny Date: Thu, 7 Sep 2017 15:58:56 +0800 Subject: [PATCH] merge with upstream/frappe --- frappe/twofactor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/twofactor.py b/frappe/twofactor.py index 272eba27c4..6e62e6a070 100644 --- a/frappe/twofactor.py +++ b/frappe/twofactor.py @@ -12,7 +12,7 @@ from pyqrcode import create as qrcreate from six import StringIO from base64 import b64encode, b32encode from frappe.utils import get_url, get_datetime, time_diff_in_seconds -from six import string_types +from six import iteritems, string_types class ExpiredLoginException(Exception): pass