Old style exceptions --> new style for Python 3

Python 3 treats old style exceptions as syntax errors but new style exceptions work as expected in both Python 2 and Python 3.

tests/test_07_api_project.py

@@ -240,7 +240,7 @@ class TestApiProject:
         """
         resp_obj = resp_json(resp)['data']
         servers = []
-        if resp_obj.has_key('server_info'):
+        if 'server_info' in resp_obj:
             for server in resp_obj['server_info']:
                 servers.append(str(server['id']))
 

walle/api/api.py

@@ -32,10 +32,10 @@ class ApiResource(Resource):
 
     @staticmethod
     def json(code=0, message=None, data=[]):
-        if not Code.code_msg.has_key(code):
+        if code not in Code.code_msg:
             current_app.logger.error('unkown code %s' % (code))
 
-        if Code.code_msg.has_key(code) and not message:
+        if code in Code.code_msg and not message:
             message = Code.code_msg[code]
 
         return jsonify({
@@ -113,7 +113,7 @@ class SecurityResource(ApiResource):
     def is_super(func):
         @wraps(func)
         def is_enable(*args, **kwargs):
-            if current_user.role_info.name <> 'super':
+            if current_user.role_info.name != 'super':
                 return ApiResource.render_json(code=403, message=u'无操作权限')
             current_app.logger.info("user is login: %s" % (current_user.is_authenticated))
             current_app.logger.info("args: %s kwargs: %s" % (args, kwargs))

walle/api/environment.py

@@ -52,7 +52,7 @@ class EnvironmentAPI(SecurityResource):
 
         env_model = EnvironmentModel()
         env_list, count = env_model.list(page=page, size=size, kw=kw)
-        return self.list_json(list=env_list, count=count, table=table, enable_create=permission.enable_role(MASTER) and current_user.role <> SUPER)
+        return self.list_json(list=env_list, count=count, table=table, enable_create=permission.enable_role(MASTER) and current_user.role != SUPER)
 
     def item(self, env_id):
         """

walle/api/general.py

@@ -58,7 +58,7 @@ class GeneralAPI(SecurityResource):
         }
         # TODO
         # 超管不需要展示空间列表
-        if current_user.role <> SUPER:
+        if current_user.role != SUPER:
             space = {
                 'current': session['space_info'],
                 'available': session['space_list'],

walle/api/project.py

@@ -48,7 +48,7 @@ class ProjectAPI(SecurityResource):
 
         project_model = ProjectModel()
         project_list, count = project_model.list(page=page, size=size, kw=kw, environment_id=environment_id, space_id=self.space_id)
-        return self.list_json(list=project_list, count=count, enable_create=permission.enable_role(MASTER) and current_user.role <> SUPER)
+        return self.list_json(list=project_list, count=count, enable_create=permission.enable_role(MASTER) and current_user.role != SUPER)
 
     def item(self, project_id):
         """

walle/api/space.py

@@ -115,7 +115,7 @@ class SpaceAPI(SecurityResource):
             # a new type to update a model
             ret = space.update(data)
             # create group
-            if request.form.has_key('members'):
+            if 'members' in request.form:
                 MemberModel(group_id=space_id).update_group(members=json.loads(request.form['members']))
             return self.render_json(data=space.item())
         else:

walle/api/task.py

@@ -41,7 +41,7 @@ class TaskAPI(SecurityResource):
 
         task_model = TaskModel()
         task_list, count = task_model.list(page=page, size=size, kw=kw, space_id=self.space_id)
-        return self.list_json(list=task_list, count=count, enable_create=permission.enable_role(REPORT) and current_user.role <> SUPER)
+        return self.list_json(list=task_list, count=count, enable_create=permission.enable_role(REPORT) and current_user.role != SUPER)
 
     def item(self, task_id):
         """

walle/api/user.py

@@ -47,7 +47,7 @@ class UserAPI(SecurityResource):
         kw = request.values.get('kw', '')
 
         uids = []
-        if current_user.role <> SUPER and space_id:
+        if current_user.role != SUPER and space_id:
             members = MemberModel(group_id=current_user.last_space).members()
             uids = members['user_ids']
 

walle/app.py

@@ -62,7 +62,7 @@ def create_app(config_object=ProdConfig):
         return render_template('socketio.html')
 
     # 单元测试不用开启 websocket
-    if app.config.get('ENV') <> 'test':
+    if app.config.get('ENV') != 'test':
         register_socketio(app)
 
     reload(sys)

walle/model/user.py

@@ -280,7 +280,7 @@ class UserModel(UserMixin, SurrogatePK, Model):
         spaces = current_user.has_spaces()
 
         # 1.无空间权限且非超管
-        if not spaces and current_user.role <> SUPER:
+        if not spaces and current_user.role != SUPER:
             raise WalleError(Code.space_empty)
 
         default_space = spaces.keys()[0]
@@ -445,21 +445,21 @@ class MenuModel(SurrogatePK, Model):
             .all()
         for m_id, m_name, c_id, c_name, a_id, a_name in data:
             # module
-            if not menus_module.has_key(m_id):
+            if m_id not in menus_module:
                 menus_module[m_id] = {
                     'id': m_id,
                     'title': m_name,
                     'sub_menu': {},
                 }
             # controller
-            if not menus_module[m_id]['sub_menu'].has_key(c_id) and c_name:
+            if c_id not in menus_module[m_id]['sub_menu'] and c_name:
                 menus_module[m_id]['sub_menu'][c_id] = {
                     'id': c_id,
                     'title': c_name,
                     'sub_menu': {},
                 }
             # action
-            if not menus_controller.has_key(c_id):
+            if c_id not in menus_controller:
                 menus_controller[c_id] = []
             if a_name:
                 menus_controller[c_id].append({
@@ -734,7 +734,7 @@ class MemberModel(SurrogatePK, Model):
         user_info = user_model.fetch_by_uid(uids=set(user_ids))
         if user_info:
             for user in user_info:
-                if user_role.has_key(user['id']):
+                if user['id'] in user_role:
                     user['role'] = user_role[user['id']]
 
         members['user_ids'] = user_ids
@@ -801,7 +801,7 @@ class SpaceModel(SurrogatePK, Model):
             query = query.filter(SpaceModel.name.like('%' + kw + '%'))
 
         # TODO 如果是超管,可以全量,否则需要过滤自己有权限的空间列表
-        if g.role <> SUPER:
+        if g.role != SUPER:
             query = query.filter_by(user_id=g.id)
         count = query.count()
         data = query.order_by(SpaceModel.id.desc()).offset(int(size) * int(page)).limit(size).all()
@@ -867,7 +867,7 @@ class SpaceModel(SurrogatePK, Model):
         item = {
             'id': self.id,
             'user_id': self.user_id,
-            'user_name': uid2name[self.user_id] if uid2name and uid2name.has_key(self.user_id) else '',
+            'user_name': uid2name[self.user_id] if uid2name and self.user_id in uid2name else '',
             # TODO
             'group_id': 'self.group_id',
             'name': self.name,

walle/service/deployer.py

@@ -382,7 +382,7 @@ class Deployer:
             self.prev_release(self.connections[server])
             self.release(self.connections[server])
             self.post_release(self.connections[server])
-        except Exception, e:
+        except Exception as e:
             current_app.logger.exception(e)
             self.errors[server] = e.message
 

walle/service/error.py

@@ -27,10 +27,10 @@ class WalleError(Exception):
             self.message = message
 
     def render_error(self):
-        if not Code.code_msg.has_key(self.code):
+        if self.code not in Code.code_msg:
             current_app.logger.error('unkown code %s' % (self.code))
 
-        if Code.code_msg.has_key(self.code):
+        if self.code in Code.code_msg:
             self.message = Code.code_msg[self.code]
 
         return jsonify({

walle/service/waller.py

@@ -60,7 +60,7 @@ class Waller(Connection):
             current_app.logger.info(message)
             return result
 
-        except Exception, e:
+        except Exception as e:
             #current_app.logger.exception(e)
             #return None
             # TODO 貌似可能的异常有很多种，需要分层才能完美解决 something wrong without e.result
@@ -138,7 +138,7 @@ class Waller(Connection):
                 emit('console', {'event': 'task:console', 'data': ws_dict}, room=wenv['task_id'])
 
             return result
-        except Exception, e:
+        except Exception as e:
             # TODO 收尾下
             current_app.logger.info('put: %s, %s', e, dir(e))