Merge branch 'master' of https://github.com/bbangert/beaker

Author: amol-

beaker/container.py

@@ -676,16 +676,8 @@ def do_open(self, flags, replace):
 
     def do_close(self):
         if self.flags == 'c' or self.flags == 'w':
-            if os.name == 'posix':
-                tempname = '%s.temp' % (self.file)
-                fh = open(tempname, 'wb')
-                pickle.dump(self.hash, fh)
-                fh.close()
-                os.rename(tempname, self.file)
-            else:
-                fh = open(self.file, 'wb')
-                pickle.dump(self.hash, fh)
-                fh.close()
+            pickled = pickle.dumps(self.hash)
+            util.safe_write(self.file, pickled)
 
         self.hash = {}
         self.flags = None

beaker/util.py

@@ -492,3 +492,16 @@ def machine_identifier():
     else:
         machine_hash.update(socket.gethostname())
     return binascii.hexlify(machine_hash.digest()[0:3]).decode('ascii')
+
+
+def safe_write (filepath, contents):
+    if os.name == 'posix':
+        tempname = '%s.temp' % (filepath)
+        fh = open(tempname, 'wb')
+        fh.write(contents)
+        fh.close()
+        os.rename(tempname, filepath)
+    else:
+        fh = open(filepath, 'wb')
+        fh.write(contents)
+        fh.close()