Renamed version function

The name clash with the version module was causing problems with
documentation.

Author: jim-easterbrook

CHANGELOG.txt

@@ -40,6 +40,7 @@ Changes in v0.18.0:
  12/ Deprecated keys(), values(), and items() methods and iterator of exiv2
      "data" structure types.
  13/ API CHANGE: exiv2.LogMsg.pythonHandler is replaced by exiv2.pythonHandler
+ 14/ API CHANGE: exiv2.version function renamed to exiv2.versionFull
 
 Changes in v0.17.5:
   1/ Binary wheels incorporate libexiv2 v0.28.7.

src/interface/version.i

@@ -29,6 +29,9 @@
 // Catch all C++ exceptions
 EXCEPTION()
 
+// Rename version function to avoid name clash with version module
+%rename (versionFull) version;
+
 // Function to report build options used
 %feature("docstring") versionInfo "Return a dict of libexiv2 build options."
 %fragment("set_EXV_ENABLE_FILESYSTEM");

src/swig-0_27_7/version_wrap.cxx

@@ -4624,11 +4624,11 @@ SWIGINTERN PyObject *_wrap_versionNumberHexString(PyObject *self, PyObject *args
 }
 
 
-SWIGINTERN PyObject *_wrap_version(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_versionFull(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   char *result = 0 ;
 
-  if (!SWIG_Python_UnpackTuple(args, "version", 0, 0, 0)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "versionFull", 0, 0, 0)) SWIG_fail;
   {
     try {
       result = (char *)Exiv2::version();
@@ -4696,7 +4696,7 @@ static PyMethodDef SwigMethods[] = {
 	 { "versionNumber", _wrap_versionNumber, METH_NOARGS, "Return the version of %Exiv2 available at runtime as an integer."},
 	 { "versionString", _wrap_versionString, METH_NOARGS, "Return the version string Example: \"0.25.0\" (major.minor.patch)"},
 	 { "versionNumberHexString", _wrap_versionNumberHexString, METH_NOARGS, "Return the version of %Exiv2 as hex string of fixed length 6."},
-	 { "version", _wrap_version, METH_NOARGS, "Return the version of %Exiv2 as \"C\" string eg \"0.27.0.2\"."},
+	 { "versionFull", _wrap_versionFull, METH_NOARGS, "Return the version of %Exiv2 as \"C\" string eg \"0.27.0.2\"."},
 	 { "testVersion", _wrap_testVersion, METH_VARARGS, "\n"
 		"Test the version of the available %Exiv2 library at runtime. Return\n"
 		"       true if it is the same as or newer than the passed-in version.\n"

src/swig-0_28_7/version_wrap.cxx

@@ -4628,11 +4628,11 @@ SWIGINTERN PyObject *_wrap_versionNumberHexString(PyObject *self, PyObject *args
 }
 
 
-SWIGINTERN PyObject *_wrap_version(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_versionFull(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   char *result = 0 ;
 
-  if (!SWIG_Python_UnpackTuple(args, "version", 0, 0, 0)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "versionFull", 0, 0, 0)) SWIG_fail;
   {
     try {
       result = (char *)Exiv2::version();
@@ -4700,7 +4700,7 @@ static PyMethodDef SwigMethods[] = {
 	 { "versionNumber", _wrap_versionNumber, METH_NOARGS, "Return the version of %Exiv2 available at runtime as a uint32_t."},
 	 { "versionString", _wrap_versionString, METH_NOARGS, "Return the version string Example: \"0.25.0\" (major.minor.patch)"},
 	 { "versionNumberHexString", _wrap_versionNumberHexString, METH_NOARGS, "Return the version of %Exiv2 as hex string of fixed length 6."},
-	 { "version", _wrap_version, METH_NOARGS, "Return the version of %Exiv2 as \"C\" string eg \"0.27.0.2\"."},
+	 { "versionFull", _wrap_versionFull, METH_NOARGS, "Return the version of %Exiv2 as \"C\" string eg \"0.27.0.2\"."},
 	 { "testVersion", _wrap_testVersion, METH_VARARGS, "\n"
 		"Test the version of the available %Exiv2 library at runtime. Return\n"
 		"       true if it is the same as or newer than the passed-in version.\n"

tests/test_version.py

@@ -27,7 +27,7 @@ def test_module(self):
         result = exiv2.testVersion(0, 27, 0)
         self.assertIsInstance(result, bool)
         self.assertEqual(result, True)
-        version = exiv2.version()
+        version = exiv2.versionFull()
         self.assertIsInstance(version, str)
         self.assertGreaterEqual(version, '0.27.0')
         version_tuple = tuple(int(x) for x in version.split('.')[:3])