Fix gallery merging: support for None offsets

[redakcja.git] / apps / filebrowser / base.py

diff --git a/apps/filebrowser/base.py b/apps/filebrowser/base.py
index da53d91..c124026 100644 (file)
--- a/apps/filebrowser/base.py
+++ b/apps/filebrowser/base.py
@@ -1,15 +1,22 @@
-# coding: utf-8
+# -*- coding: utf-8

 
 

-import locale
+from django.conf import settings
+from django.utils.encoding import smart_unicode
+from filebrowser.fb_settings import *
+
+from filebrowser.functions import _get_file_type, _url_join, _is_selectable, \
+    _get_version_path

 
 

-import os, re, datetime

 from time import gmtime, strftime
 from time import gmtime, strftime

-from django.conf import settings
+
+import locale
+import os
+import re
+import datetime

 import urllib
 
 import urllib
 

+

 # filebrowser imports
 # filebrowser imports

-from filebrowser.fb_settings import *
-from filebrowser.functions import _get_file_type, _url_join, _is_selectable, _get_version_path

 
 # PIL import
 if STRICT_PIL:
 
 # PIL import
 if STRICT_PIL:


@@ -26,18 +33,19 @@ def filesystem_encoding(ucode):
     ucode = urllib.quote(ucode)
     return ucode
 
     ucode = urllib.quote(ucode)
     return ucode
 

+

 class FileObject(object):
     """
     The FileObject represents a File on the Server.
 class FileObject(object):
     """
     The FileObject represents a File on the Server.

-    
+

     PATH has to be relative to MEDIA_ROOT.
     """
 
     def __init__(self, path):
     PATH has to be relative to MEDIA_ROOT.
     """
 
     def __init__(self, path):

-        self.path = unicode(path)
+        self.path = path

         self.head = os.path.split(path)[0]
         self.filename = os.path.split(path)[1]
         self.head = os.path.split(path)[0]
         self.filename = os.path.split(path)[1]

-        self.filename_lower = self.filename.lower() # important for sorting
+        self.filename_lower = self.filename.lower()  # important for sorting

         self.filetype = _get_file_type(self.filename)
 
     def _filesize(self):
         self.filetype = _get_file_type(self.filename)
 
     def _filesize(self):


@@ -204,6 +212,3 @@ class FileObject(object):
 
     def __unicode__(self):
         return u"%s" % self.url_save
 
     def __unicode__(self):
         return u"%s" % self.url_save

-
-
-