Fixing byte writing for unicode and python 3 happiness

Author: bridadan

test/platform_database.py

@@ -39,13 +39,13 @@ class EmptyPlatformDatabaseTests(unittest.TestCase):
 
     def setUp(self):
         self.base_db_path = os.path.join(tempfile.mkdtemp(), 'base')
-        self.base_db = open(self.base_db_path, 'w+')
+        self.base_db = open(self.base_db_path, 'w+b')
         self.base_db.write(b'{}')
         self.base_db.seek(0)
         self.pdb = PlatformDatabase([self.base_db_path])
 
     def tearDown(self):
-        pass
+        self.base_db.close()
 
     def test_broken_database_io(self):
         """Verify that the platform database still works without a
@@ -61,7 +61,7 @@ def test_broken_database_bad_json(self):
         """Verify that the platform database still works without a
         working backing file
         """
-        self.base_db.write(b'{{}')
+        self.base_db.write(b'{}')
         self.base_db.seek(0)
         self.pdb = PlatformDatabase([self.base_db_path])
         self.pdb.add("1234", "MYTARGET")
@@ -122,12 +122,12 @@ class OverriddenPlatformDatabaseTests(unittest.TestCase):
     def setUp(self):
         self.temp_dir = tempfile.mkdtemp()
         self.base_db_path = os.path.join(self.temp_dir, 'base')
-        self.base_db = open(self.base_db_path, 'w+')
+        self.base_db = open(self.base_db_path, 'w+b')
         self.base_db.write(json.dumps(dict([('0123', 'Base_Platform')])).
                            encode('utf-8'))
         self.base_db.seek(0)
         self.overriding_db_path = os.path.join(self.temp_dir, 'overriding')
-        self.overriding_db = open(self.overriding_db_path, 'w+')
+        self.overriding_db = open(self.overriding_db_path, 'w+b')
         self.overriding_db.write(b'{}')
         self.overriding_db.seek(0)
         self.pdb = PlatformDatabase([self.overriding_db_path, self.base_db_path],
@@ -136,7 +136,8 @@ def setUp(self):
         self.overriding_db.seek(0)
 
     def tearDown(self):
-        pass
+        self.base_db.close()
+        self.overriding_db.close()
 
     def assertBaseUnchanged(self):
         """Assert that the base database has not changed
@@ -237,14 +238,14 @@ def setUp(self):
         self.release = self.mocked_lock.return_value.release
 
         self.base_db_path = os.path.join(tempfile.mkdtemp(), 'base')
-        self.base_db = open(self.base_db_path, 'w+')
+        self.base_db = open(self.base_db_path, 'w+b')
         self.base_db.write(b'{}')
         self.base_db.seek(0)
         self.pdb = PlatformDatabase([self.base_db_path])
         self.addCleanup(patch.stopall)
 
     def tearDown(self):
-        pass
+        self.base_db.close()
 
     def test_no_update(self):
         """Test that no locks are used when no modifications are specified