Merge pull request shotgunsoftware#39 from shotgunsoftware/20856_make_authenticate_human_user_nonsticky

KP · KP · commit 47b563b253ee · 2013-04-04T14:38:23.000-07:00
Make sure to reset user_login/user_password after authentication. #20856
diff --git a/shotgun_api3/shotgun.py b/shotgun_api3/shotgun.py
@@ -1171,13 +1171,10 @@ def authenticate_human_user(self, user_login, user_password):
 
         try:
             data = self.find_one('HumanUser', [['sg_status_list', 'is', 'act'], ['login', 'is', user_login]], ['id', 'login'], '', 'all')
-            if data:
-                return data
-            else:
-                None
             # Set back to default - There finally and except cannot be used together in python2.4
             self.config.user_login = None
             self.config.user_password = None
+            return data
         except Fault:
             # Set back to default - There finally and except cannot be used together in python2.4
             self.config.user_login = None
