From df343aec64c5ae2f37d42def81bc69546f7754d9 Mon Sep 17 00:00:00 2001
From: Sunny <schilgod@gmail.com>
Date: Thu, 7 Sep 2017 16:04:55 +0800
Subject: [PATCH] merge with upstream/frappe

---
 frappe/core/doctype/system_settings/system_settings.js | 2 +-
 frappe/core/doctype/system_settings/system_settings.py | 2 +-
 frappe/tests/test_twofactor.py                         | 2 +-
 frappe/twofactor.py                                    | 9 +++------
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/frappe/core/doctype/system_settings/system_settings.js b/frappe/core/doctype/system_settings/system_settings.js
index bb16473ce4..62c044121b 100644
--- a/frappe/core/doctype/system_settings/system_settings.js
+++ b/frappe/core/doctype/system_settings/system_settings.js
@@ -25,4 +25,4 @@ frappe.ui.form.on("System Settings", "enable_two_factor_auth", function(frm) {
 	if(frm.doc.enable_two_factor_auth == 0){
 		frm.set_value("bypass_2fa_for_retricted_ip_users", 0);
 	}
-});
+});
\ No newline at end of file
diff --git a/frappe/core/doctype/system_settings/system_settings.py b/frappe/core/doctype/system_settings/system_settings.py
index 38ed4babea..ef2863fd46 100644
--- a/frappe/core/doctype/system_settings/system_settings.py
+++ b/frappe/core/doctype/system_settings/system_settings.py
@@ -61,4 +61,4 @@ def load():
 	return {
 		"timezones": get_all_timezones(),
 		"defaults": defaults
-	}
+	}
\ No newline at end of file
diff --git a/frappe/tests/test_twofactor.py b/frappe/tests/test_twofactor.py
index 6bf36683be..e6e4552125 100644
--- a/frappe/tests/test_twofactor.py
+++ b/frappe/tests/test_twofactor.py
@@ -169,4 +169,4 @@ def toggle_2fa_all_role(state=None):
 def get_otp(user):
 	otp_secret = get_otpsecret_for_(user)
 	otp = pyotp.TOTP(otp_secret)
-	return otp.now()
+	return otp.now()
\ No newline at end of file
diff --git a/frappe/twofactor.py b/frappe/twofactor.py
index 6e62e6a070..796f4310d8 100644
--- a/frappe/twofactor.py
+++ b/frappe/twofactor.py
@@ -74,7 +74,7 @@ def cache_2fa_data(user, token, otp_secret, tmp_id):
 		frappe.cache().expire(tmp_id + '_token', expiry_time)
 	else:
 		expiry_time = 180
-	for k, v in {'_usr': user, '_pwd': pwd, '_otp_secret': otp_secret}.iteritems():
+	for k, v in iteritems({'_usr': user, '_pwd': pwd, '_otp_secret': otp_secret}):
 		frappe.cache().set("{0}{1}".format(tmp_id, k), v)
 		frappe.cache().expire("{0}{1}".format(tmp_id, k), expiry_time)
 
@@ -87,8 +87,7 @@ def two_factor_is_enabled_for_(user):
 	roles.append('All')
 
 	query = """select name from `tabRole` where two_factor_auth=1
-		and name in ({0}) limit 1""".format(', '.join('\"{}\"'.format(i) for \
-											i in roles))
+		and name in ({0}) limit 1""".format(', '.join('\"{}\"'.format(i) for i in roles))
 	if len(frappe.db.sql(query)) > 0:
 		return True
 
@@ -155,7 +154,6 @@ def get_verification_obj(user, token, otp_secret):
 		verification_obj = process_2fa_for_email(user, token, otp_secret, otp_issuer)
 	return verification_obj
 
-
 def process_2fa_for_sms(user, token, otp_secret):
 	'''Process sms method for 2fa.'''
 	phone = frappe.db.get_value('User', user, ['phone', 'mobile_no'], as_dict=1)
@@ -385,5 +383,4 @@ def should_remove_barcode_image(barcode):
 	return False
 
 def disable():
-	frappe.db.set_value('System Settings', None, 'enable_two_factor_auth', 0)
-
+	frappe.db.set_value('System Settings', None, 'enable_two_factor_auth', 0)
\ No newline at end of file