Small code cleanups.

abilian/app.py

@@ -774,7 +774,7 @@ def init_sentry(self):
     """
     Installs Sentry handler if config defines 'SENTRY_DSN'.
     """
-    if self.config.get('SENTRY_DSN', None):
+    if self.config.get('SENTRY_DSN'):
       try:
         from abilian.core.sentry import Sentry
       except ImportError:
@@ -786,7 +786,7 @@ def init_sentry(self):
       ext = Sentry(self, logging=True, level=logging.ERROR)
       ext.client.tags['app_name'] = self.name
       ext.client.tags['process_type'] = 'web'
-      server_name = str(self.config.get('SERVER_NAME', None))
+      server_name = str(self.config.get('SERVER_NAME'))
       ext.client.tags['configured_server_name'] = server_name
 
 
@@ -863,7 +863,7 @@ def _finalize_assets_setup(self):
     for name, data in self._assets_bundles.items():
       bundles = data.get('bundles', [])
       options = data.get('options', {})
-      filters = options.get('filters', None) or []
+      filters = options.get('filters') or []
       options['filters'] = []
       for f in filters:
         if f == 'closure_js':

abilian/core/models/attachment.py

@@ -126,6 +126,6 @@ def set_attachment_name(mapper, connection, target):
   if not blob:
     return
 
-  filename = blob.meta.get('filename', None)
+  filename = blob.meta.get('filename')
   if filename is not None:
     target.name = filename

abilian/web/attachments/views.py

@@ -21,6 +21,7 @@
 
 bp = Blueprint('attachments', __name__, url_prefix='/attachments')
 
+
 def _default_attachment_view(obj, obj_type, obj_id, **kwargs):
   entity = obj.entity
   return url_for(entity, _anchor='attachment-{}'.format(obj.id))
@@ -31,7 +32,7 @@ def register_default_view(state):
   state.app.default_view.register(Attachment, _default_attachment_view)
 
 UPLOAD_BUTTON = ButtonAction('form', 'edit', btn_class='primary',
-                              title=_l(u'Send'))
+                             title=_l(u'Send'))
 
 
 class BaseAttachmentView(object):
@@ -83,7 +84,7 @@ def get(self):
     blob = self.obj.blob
     metadata = blob.meta
     filename = metadata.get('filename', self.obj.name)
-    content_type = metadata.get('mimetype', None)
+    content_type = metadata.get('mimetype')
     stream = blob.file.open('rb')
 
     return send_file(stream,

abilian/web/forms/fields.py

@@ -192,7 +192,7 @@ def process_formdata(self, valuelist):
 
       meta = uploads.get_metadata(current_user, handle)
       filename = meta.get('filename', handle)
-      mimetype = meta.get('mimetype', None)
+      mimetype = meta.get('mimetype')
       stream = fileobj.open('rb')
       setattr(stream, 'filename', filename)
       if mimetype:

abilian/web/uploads/views.py

@@ -84,7 +84,7 @@ def get(self, handle, *args, **kwargs):
 
     metadata = self.uploads.get_metadata(self.user, handle)
     filename = metadata.get('filename', handle)
-    content_type = metadata.get('mimetype', None)
+    content_type = metadata.get('mimetype')
     stream = file_obj.open('rb')
 
     return send_file(stream,

abilian/web/views/images.py

@@ -66,7 +66,7 @@ def __init__(self, max_size=None, set_expire=None, expire_offset=None,
   def prepare_args(self, args, kwargs):
     if self.set_expire:
       vary_arg = kwargs.get(self.expire_vary_arg,
-                            request.args.get(self.expire_vary_arg, None))
+                            request.args.get(self.expire_vary_arg))
       if vary_arg is None:
         # argument for timestamp, serial etc is missing. We must refuse to serve
         # an image with expiry date set up to maybe 1 year from now.
@@ -211,7 +211,7 @@ def get(self, user, image, size, *args, **kwargs):
     if user.last_name:
       letter = user.last_name[0]
     elif user.first_name:
-      letter = user.first_name[0] 
+      letter = user.first_name[0]
     else:
       letter = u"?"
     letter = letter.upper()