Clean up.

abilian/services/conversion.py

@@ -590,7 +590,7 @@ def convert(self, key):
 
     converted = decodestring(data)
     new_key = hashlib.md5(converted).hexdigest()
-    with open("data/%s.blob" % new_key, "wcb") as fd:
+    with open("data/%s.blob" % new_key, "wb") as fd:
       fd.write(converted)
     return new_key
 

abilian/services/security/service.py

@@ -282,7 +282,7 @@ def _all_roles(self, principal):
 
     if isinstance(principal, User):
       filter_cond = (RoleAssignment.user == principal)
-      if len(principal.groups) > 0:
+      if principal.groups:
         group_ids = (g.id for g in principal.groups)
         filter_cond |= (RoleAssignment.group_id.in_(group_ids))
 
@@ -485,7 +485,7 @@ def grant_role(self, principal, role, obj=None):
       args['group'] = principal
 
     q = session.query(RoleAssignment)
-    if len(q.filter_by(**args).limit(1).all()) > 0:
+    if q.filter_by(**args).limit(1).count():
       # role already granted, nothing to do
       return
 

abilian/services/settings/models.py

@@ -28,7 +28,8 @@ def decode(self, type_, value):
     return value
 
   def register(self, type_, encoder=None, decoder=None):
-    assert type_ and any((encoder, decoder))
+    assert type_
+    assert any((encoder, decoder))
     if encoder:
       self.encoders[type_] = encoder
     if decoder:

abilian/services/vocabularies/admin.py

@@ -87,12 +87,9 @@ def post(self):
     data = request.form
     group = data.get('group', u'').strip()
     Model = data.get('Model', u'').strip()
-    return_to = data.get('return_to', None)
+    return_to = data.get('return_to')
     return_endpoint = '.vocabularies'
     return_args = {}
-    cmp_op = None
-    cmp_order = None
-    object_id = None
 
     if return_to not in (None, 'group', 'model'):
       return_to = None
@@ -135,9 +132,9 @@ def do_return():
     session = current_app.db.session()
     query = Model.query.with_lockmode('update')
     item = query.get(object_id)
-    other = query\
-        .filter(cmp_op(item.position))\
-        .order_by(cmp_order)\
+    other = query \
+        .filter(cmp_op(item.position)) \
+        .order_by(cmp_order) \
         .first()
 
     if other is not None:
@@ -165,8 +162,7 @@ def group_view(self, group):
         url_for_voc_edit=self.voc_edit_url,
         icon_checked=Glyphicon('check'),
         vocabularies={group: vocabularies},
-        edit_return_to='group',
-    )
+        edit_return_to='group')
 
   def model_view(self, Model, group=None):
     return render_template(
@@ -175,8 +171,7 @@ def model_view(self, Model, group=None):
         url_for_voc_edit=self.voc_edit_url,
         icon_checked=Glyphicon('check'),
         vocabularies={Model.Meta.group: [Model]},
-        edit_return_to='model',
-      )
+        edit_return_to='model')
 
   def install_additional_rules(self, add_url_rule):
     panel_endpoint = '.' + self.id

abilian/web/admin/panels/sysinfo.py

@@ -50,7 +50,7 @@ def get(self):
         package['vcs'] = dict(name=vcs_name, url=url, revision=revision)
 
       packages.append(package)
-      packages.sort(key=lambda d: d.get('key', None))
+      packages.sort(key=lambda d: d.get('key'))
 
     return render_template("admin/sysinfo.html",
                            python_version=python_version,

abilian/web/forms/widgets.py

@@ -219,8 +219,8 @@ def render_line(self, entity):
       format = col.get('format')
       if format:
         cell = format(value)
-      elif column_name == make_link_on or column_name == 'name' or \
-         col.get('linkable'):
+      elif column_name in (make_link_on, 'name') \
+          or col.get('linkable'):
         cell = Markup('<a href="%s">%s</a>'
                       % (build_url(entity), cgi.escape(unicode(value))))
       elif isinstance(value, Entity):