Sourcery refactored master branch

filebrowser_safe/fields.py

@@ -29,17 +29,14 @@ def __init__(self, attrs=None):
         self.directory = attrs.get('directory', '')
         self.extensions = attrs.get('extensions', '')
         self.format = attrs.get('format', '')
-        if attrs is not None:
-            self.attrs = attrs.copy()
-        else:
-            self.attrs = {}
+        self.attrs = attrs.copy() if attrs is not None else {}
 
     def render(self, name, value, attrs=None):
         if value is None:
             value = ""
         directory = self.directory
-        if self.directory:
-            if callable(self.directory):
+        if directory:
+            if callable(directory):
                 directory = self.directory()
             directory = os.path.normpath(datetime.datetime.now().strftime(directory))
             fullpath = os.path.join(get_directory(), directory)
@@ -77,7 +74,7 @@ def clean(self, value):
         if value == '':
             return value
         file_extension = os.path.splitext(value)[1].lower().split("?")[0]
-        if self.extensions and not file_extension in self.extensions:
+        if self.extensions and file_extension not in self.extensions:
             raise forms.ValidationError(self.error_messages['extension'] % {'ext': file_extension, 'allowed': ", ".join(self.extensions)})
         return value
 

filebrowser_safe/functions.py

@@ -73,10 +73,7 @@ def url_join(*args):
     """
     URL join routine.
     """
-    if args[0].startswith("http://"):
-        url = "http://"
-    else:
-        url = "/"
+    url = "http://" if args[0].startswith("http://") else "/"
     for arg in args:
         arg = str(arg).replace("\\", "/")
         arg_split = arg.split("/")
@@ -211,11 +208,7 @@ def convert_filename(value):
             v = re.sub(r'[^\w\s-]', '', v).strip()
             normalized.append(v)
 
-        if len(normalized) > 1:
-            value = '.'.join(normalized)
-        else:
-            value = normalized[0]
-
+        value = '.'.join(normalized) if len(normalized) > 1 else normalized[0]
     if CONVERT_FILENAME:
         value = value.replace(" ", "_").lower()
 

filebrowser_safe/templatetags/fb_pagination.py

@@ -17,9 +17,6 @@ def pagination(context):
     if not paginator.num_pages or paginator.num_pages == 1:
         page_range = []
     else:
-        ON_EACH_SIDE = 3
-        ON_ENDS = 2
-
         # If there are 10 or fewer pages, display links to every page.
         # Otherwise, do some fancy
         if paginator.num_pages <= 10:
@@ -29,12 +26,15 @@ def pagination(context):
             # links at either end of the list of pages, and there are always
             # ON_EACH_SIDE links at either end of the "current page" link.
             page_range = []
+            ON_EACH_SIDE = 3
+            ON_ENDS = 2
+
             if page_num > (ON_EACH_SIDE + ON_ENDS):
-                page_range.extend(list(range(0, ON_EACH_SIDE - 1)))
+                page_range.extend(list(range(ON_EACH_SIDE - 1)))
                 page_range.append(DOT)
                 page_range.extend(list(range(page_num - ON_EACH_SIDE, page_num + 1)))
             else:
-                page_range.extend(list(range(0, page_num + 1)))
+                page_range.extend(list(range(page_num + 1)))
             if page_num < (paginator.num_pages - ON_EACH_SIDE - ON_ENDS - 1):
                 page_range.extend(list(range(page_num + 1, page_num + ON_EACH_SIDE + 1)))
                 page_range.append(DOT)

filebrowser_safe/templatetags/fb_tags.py

@@ -122,7 +122,7 @@ def render(self, context):
             format = ''
         if filetype and format and filetype in SELECT_FORMATS[format]:
             selectable = True
-        elif filetype and format and filetype not in SELECT_FORMATS[format]:
+        elif filetype and format:
             selectable = False
         else:
             selectable = True

filebrowser_safe/views.py

@@ -103,10 +103,7 @@ def browse(request):
 
     # INITIAL VARIABLES
     results_var = {'results_total': 0, 'results_current': 0, 'delete_total': 0, 'images_total': 0, 'select_total': 0}
-    counter = {}
-    for k, v in EXTENSIONS.items():
-        counter[k] = 0
-
+    counter = {k: 0 for k, v in EXTENSIONS.items()}
     dir_list, file_list = default_storage.listdir(abs_path)
     files = []
     for file in dir_list + file_list:
@@ -140,7 +137,7 @@ def browse(request):
                     results_var['images_total'] += 1
                 if fileobject.filetype != 'Folder':
                     results_var['delete_total'] += 1
-                elif fileobject.filetype == 'Folder' and fileobject.is_empty:
+                elif fileobject.is_empty:
                     results_var['delete_total'] += 1
                 if query.get('type') and query.get('type') in SELECT_FORMATS and fileobject.filetype in SELECT_FORMATS[query.get('type')]:
                     results_var['select_total'] += 1
@@ -296,9 +293,10 @@ def _check_file(request):
     fileArray = {}
     if request.method == 'POST':
         for k, v in list(request.POST.items()):
-            if k != "folder":
-                if default_storage.exists(os.path.join(get_directory(), folder, v)):
-                    fileArray[k] = v
+            if k != "folder" and default_storage.exists(
+                os.path.join(get_directory(), folder, v)
+            ):
+                fileArray[k] = v
     return HttpResponse(dumps(fileArray))