code style

[redakcja.git] / apps / catalogue / helpers.py

diff --git a/apps/catalogue/helpers.py b/apps/catalogue/helpers.py
index d340b46..4af1d2d 100644 (file)
--- a/apps/catalogue/helpers.py
+++ b/apps/catalogue/helpers.py
@@ -1,14 +1,13 @@
+# -*- coding: utf-8 -*-
 from datetime import date
 from functools import wraps
 from os.path import join
-from os import listdir, stat
+from os import listdir
 from shutil import move, rmtree
 from django.conf import settings
 import re
 import filecmp
 
-from django.db.models import Count
-
 
 def active_tab(tab):
     """
@@ -70,7 +69,7 @@ class GalleryMerger(object):
 
     @property
     def was_merged(self):
-        "Check if we have gallery size recorded"
+        """Check if we have gallery size recorded"""
         return self.dest_size is not None
 
     def merge(self):
@@ -106,7 +105,8 @@ class GalleryMerger(object):
         for f in files:
             p = self.get_prefix(f)
             if p:
-                if p > last_pfx: last_pfx = p
+                if p > last_pfx:
+                    last_pfx = p
             else:
                 files_prefixed = False
                 break
@@ -122,7 +122,7 @@ class GalleryMerger(object):
         for f in files_other:
             pfx = self.get_prefix(f)
             if pfx is not None:
-                if not pfx in prefixes:
+                if pfx not in prefixes:
                     last_pfx += 1
                     prefixes[pfx] = last_pfx
                 renamed_files_other[f] = self.set_prefix(f, prefixes[pfx])
@@ -138,11 +138,9 @@ class GalleryMerger(object):
 
         # finally, move / rename files.
         for frm, to in renamed_files.items():
-            move(join(self.path(self.dest), frm),
-                        join(self.path(self.dest), to))
+            move(join(self.path(self.dest), frm), join(self.path(self.dest), to))
         for frm, to in renamed_files_other.items():
-            move(join(self.path(self.src), frm),
-                        join(self.path(self.dest), to))            
+            move(join(self.path(self.src), frm), join(self.path(self.dest), to))
 
         rmtree(join(self.path(self.src)))
         return self.dest