0.4.0 rename to pyexiftool and make sure tests pass

sylikc · sylikc · commit de22a9624c4f · 2020-01-04T12:20:58.000-08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,7 +22,8 @@ Date (Timezone)              | Version | Comment
 07/19/2019 12:54:39 AM (PDT) | 0.3.3   | Merge a piece of [Pull request #11 "Robustness enhancements](https://github.com/smarnach/pyexiftool/pull/11) by [Matthias Kiefer (kiefermat)](https://github.com/kiefermat) on Oct 27, 2014<br>*On linux call prctl in subprocess to be sure that the exiftool child process is killed even if the parent process is killed by itself*<br>also removed print_conversion<br>also merged the common_args and added_args into one args list
 07/19/2019 01:18:26 AM (PDT) | 0.3.4   | Merge the rest of Pull request #11.  Added the other pieces, however, I added them as "wrappers" instead of modifying the interface of the original code.  I feel like the additions here are overly done, and as I understand the code more, I'll either remove it or incorporate it into single functions<br>from #11 *When getting json results, verify that the results returned by exiftool actually belong to the correct file by checking the SourceFile property of the returned result*<br>and also *Added possibility to provide different exiftools params for each file separately*
 07/19/2019 01:22:48 AM (PDT) | 0.3.5   | changed a bit of the test_exiftool so all the tests pass again
-
+01/04/2020 11:59:14 AM (PST) | 0.3.6   | made the tests work with the latest output of ExifTool.  This is the final version which is named "exiftool"
+01/04/2020 12:16:51 PM (PST) | 0.4.0   | pyexiftool rename (and make all tests work again) ... I also think that the pyexiftool.py has gotten too big.  I'll probably break it out into a directory structure later to make it more maintainable
 
 
 # Changes around the web
diff --git a/pyexiftool.py b/pyexiftool.py
diff --git a/test/test_pyexiftool.py b/test/test_pyexiftool.py
@@ -3,7 +3,7 @@
 from __future__ import unicode_literals
 
 import unittest
-import exiftool
+import pyexiftool
 import warnings
 import os
 import shutil
@@ -13,7 +13,7 @@ class TestExifTool(unittest.TestCase):
 
 	#---------------------------------------------------------------------------------------------------------
 	def setUp(self):
-		self.et = exiftool.ExifTool(common_args=["-G", "-n", "-overwrite_original"])
+		self.et = pyexiftool.ExifTool(common_args=["-G", "-n", "-overwrite_original"])
 	def tearDown(self):
 		if hasattr(self, "et"):
 			self.et.terminate()
@@ -56,7 +56,7 @@ def test_termination_implicit(self):
 	def test_invalid_args_list(self):
 		# test to make sure passing in an invalid args list will cause it to error out
 		with self.assertRaises(TypeError):
-			exiftool.ExifTool(common_args="not a list")
+			pyexiftool.ExifTool(common_args="not a list")
 	#---------------------------------------------------------------------------------------------------------
 	def test_get_metadata(self):
 		expected_data = [{"SourceFile": "rose.jpg",
@@ -133,12 +133,12 @@ def test_set_keywords(self):
 			shutil.copyfile(f, f_mod)
 			source_files.append(f_mod)
 			with self.et:
-				self.et.set_keywords(exiftool.KW_REPLACE, d["Keywords"], f_mod)
+				self.et.set_keywords(pyexiftool.KW_REPLACE, d["Keywords"], f_mod)
 				kwtag0 = self.et.get_tag("IPTC:Keywords", f_mod)
 				kwrest = d["Keywords"][1:]
-				self.et.set_keywords(exiftool.KW_REMOVE, kwrest, f_mod)
+				self.et.set_keywords(pyexiftool.KW_REMOVE, kwrest, f_mod)
 				kwtag1 = self.et.get_tag("IPTC:Keywords", f_mod)
-				self.et.set_keywords(exiftool.KW_ADD, kw_to_add, f_mod)
+				self.et.set_keywords(pyexiftool.KW_ADD, kw_to_add, f_mod)
 				kwtag2 = self.et.get_tag("IPTC:Keywords", f_mod)
 			os.remove(f_mod)
 			self.assertEqual(kwtag0, d["Keywords"])
@@ -156,15 +156,15 @@ def test_executable_found(self):
 		else:
 			test_path = "/"
 
-		test_exec = exiftool.DEFAULT_EXECUTABLE
+		test_exec = pyexiftool.DEFAULT_EXECUTABLE
 		
 		# should be found in path as is
-		self.assertTrue(exiftool.find_executable(test_exec, path=None))
+		self.assertTrue(pyexiftool.find_executable(test_exec, path=None))
 		
 		# modify path and search again
-		self.assertFalse(exiftool.find_executable(test_exec, path=test_path))
+		self.assertFalse(pyexiftool.find_executable(test_exec, path=test_path))
 		os.environ['PATH'] = test_path
-		self.assertFalse(exiftool.find_executable(test_exec, path=None))
+		self.assertFalse(pyexiftool.find_executable(test_exec, path=None))
 		
 		# restore it
 		os.environ['PATH'] = save_sys_path
