Jannis Leidel avatar Jannis Leidel committed 67fd746

Minor cleanup.

Comments (0)

Files changed (3)

storages/backends/overwrite.py

-import os
+from django.core.files.storage import FileSystemStorage
 
-from django.conf import settings
-from django.core.files.storage import FileSystemStorage
 
 class OverwriteStorage(FileSystemStorage):
     """
     Comes from http://www.djangosnippets.org/snippets/976/
     (even if it already exists in S3Storage for ages)
-    
+
     See also Django #4339, which might add this functionality to core.
     """
-    
+
     def get_available_name(self, name):
         """
         Returns a filename that's free on the target storage system, and

storages/backends/symlinkorcopy.py

 from django.core.files.storage import FileSystemStorage
 
 __doc__ = """
-I needed to efficiently create a mirror of a directory tree (so that 
-"origin pull" CDNs can automatically pull files). The trick was that 
-some files could be modified, and some could be identical to the original. 
-Of course it doesn't make sense to store the exact same data twice on the 
+I needed to efficiently create a mirror of a directory tree (so that
+"origin pull" CDNs can automatically pull files). The trick was that
+some files could be modified, and some could be identical to the original.
+Of course it doesn't make sense to store the exact same data twice on the
 file system. So I created SymlinkOrCopyStorage.
 
-SymlinkOrCopyStorage allows you to symlink a file when it's identical to 
+SymlinkOrCopyStorage allows you to symlink a file when it's identical to
 the original file and to copy the file if it's modified.
-Of course, it's impossible to know if a file is modified just by looking 
+Of course, it's impossible to know if a file is modified just by looking
 at the file, without knowing what the original file was.
-That's what the symlinkWithin parameter is for. It accepts one or more paths 
-(if multiple, they should be concatenated using a colon (:)). 
-Files that will be saved using SymlinkOrCopyStorage are then checked on their 
-location: if they are within one of the symlink_within directories, 
+That's what the symlinkWithin parameter is for. It accepts one or more paths
+(if multiple, they should be concatenated using a colon (:)).
+Files that will be saved using SymlinkOrCopyStorage are then checked on their
+location: if they are within one of the symlink_within directories,
 they will be symlinked, otherwise they will be copied.
 
-The rationale is that unmodified files will exist in their original location, 
-e.g. /htdocs/example.com/image.jpg and modified files will be stored in 
+The rationale is that unmodified files will exist in their original location,
+e.g. /htdocs/example.com/image.jpg and modified files will be stored in
 a temporary directory, e.g. /tmp/image.jpg.
 """
 
 class SymlinkOrCopyStorage(FileSystemStorage):
     """Stores symlinks to files instead of actual files whenever possible
-    
+
     When a file that's being saved is currently stored in the symlink_within
     directory, then symlink the file. Otherwise, copy the file.
     """
-    def __init__(self, location=settings.MEDIA_ROOT, base_url=settings.MEDIA_URL, 
+    def __init__(self, location=settings.MEDIA_ROOT, base_url=settings.MEDIA_URL,
             symlink_within=None):
         super(SymlinkOrCopyStorage, self).__init__(location, base_url)
         self.symlink_within = symlink_within.split(":")

storages/tests/hashpath.py

         saves a file twice, the file should only be stored once, because the
         content/hash is the same
         """
-        
         path_1 = self.storage.save('test', ContentFile('new content'))
-        
         path_2 = self.storage.save('test', ContentFile('new content'))
-
         self.assertEqual(path_1, path_2)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.