X-Git-Url: http://git.vrable.net/?p=cumulus.git;a=blobdiff_plain;f=python%2Fcumulus%2Fstore%2Ffile.py;h=833a5f0e0d9888cf1c512863df2a87128b5c6e77;hp=6d23a588d03d527b02457f769ae6c97bad5b02f0;hb=ee98274cfd9e9383214a9792c01fdfe4f22ef677;hpb=a5f66616b1ec0c38328ad5131bf1c889ccc43659

diff --git a/python/cumulus/store/file.py b/python/cumulus/store/file.py
index 6d23a58..833a5f0 100644
--- a/python/cumulus/store/file.py
+++ b/python/cumulus/store/file.py
@@ -16,18 +16,17 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import division, print_function, unicode_literals
+
 import os, sys, tempfile
 
 import cumulus.store
 
-type_patterns = cumulus.store.type_patterns
-
-class FileStore(cumulus.store.Store):
-    def __init__(self, url, **kw):
-        # if constructor isn't called via factory interpret url as filename
-        if not hasattr (self, 'path'):
-            self.path = url
-        self.prefix = self.path.rstrip("/")
+class Store(cumulus.store.Store):
+    """Storage backend that accesses the local file system."""
+    def __init__(self, url):
+        super(Store, self).__init__(url)
+        self.prefix = cumulus.store.unquote(url.path)
 
     def list(self, subdir):
         try:
@@ -37,16 +36,16 @@ class FileStore(cumulus.store.Store):
 
     def get(self, path):
         try:
-            return open(os.path.join(self.prefix, path), 'rb')
+            return open(os.path.join(self.prefix, path), "rb")
         except IOError:
             raise cumulus.store.NotFoundError(path)
 
     def put(self, path, fp):
-        out = open(os.path.join(self.prefix, path), 'wb')
-        buf = fp.read(4096)
-        while len(buf) > 0:
-            out.write(buf)
+        with open(os.path.join(self.prefix, path), "wb") as out:
             buf = fp.read(4096)
+            while len(buf) > 0:
+                out.write(buf)
+                buf = fp.read(4096)
 
     def delete(self, path):
         os.unlink(os.path.join(self.prefix, path))
@@ -57,5 +56,3 @@ class FileStore(cumulus.store.Store):
             return {'size': stat.st_size}
         except OSError:
             raise cumulus.store.NotFoundError(path)
-
-Store = FileStore