Makes __version__ attribute consistent throughout

* Makes __version__ attribute in watchdog/version.py a version tuple and updates references to it in the documentation. * Defines the __version__ attribute string as a preprocessor constant in the _watchdog_fsevents.h header file. Signed-off-by: Gora Khargosh <gora.khargosh@gmail.com>
gorakhargosh · Dec 29, 2010 · 1c87679 · 1c87679
1 parent 7f4edb0
commit 1c87679
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -60,9 +60,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = watchdog.version.__version__
+version = watchdog.version.VERSION_STRING
 # The full version, including alpha/beta/rc tags.
-release = watchdog.version.__version__
+release = watchdog.version.VERSION_STRING
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/src/_watchdog_fsevents.c b/src/_watchdog_fsevents.c
@@ -230,7 +230,7 @@ init_watchdog_fsevents(void)
                             MODULE_CONSTANT_NAME_POLLOUT,
                             kCFFileDescriptorWriteCallBack);
     PyModule_AddObject(module,
-                       "__version__",
+                       MODULE_ATTRIBUTE_NAME_VERSION,
                        Py_BuildValue("(iii)",
                                      WATCHDOG_VERSION_MAJOR,
                                      WATCHDOG_VERSION_MINOR,
@@ -258,7 +258,7 @@ PyInit__watchdog_fsevents(void)
                 MODULE_CONSTANT_NAME_POLLOUT,
                 kCFFileDescriptorWriteCallBack);
         PyModule_AddObject(module,
-                           "__version__",
+                           MODULE_ATTRIBUTE_NAME_VERSION,
                            Py_BuildValue("(iii)",
                                          WATCHDOG_VERSION_MAJOR,
                                          WATCHDOG_VERSION_MINOR,

diff --git a/src/_watchdog_fsevents.h b/src/_watchdog_fsevents.h
@@ -57,6 +57,7 @@ typedef int Py_ssize_t;
 #define MODULE_NAME "_watchdog_fsevents"
 #define MODULE_CONSTANT_NAME_POLLIN "POLLIN"
 #define MODULE_CONSTANT_NAME_POLLOUT "POLLOUT"
+#define MODULE_ATTRIBUTE_NAME_VERSION "__version__"
 
 /**
  * An information structure that is passed to the callback function registered

diff --git a/src/watchdog/version.py b/src/watchdog/version.py
@@ -29,4 +29,4 @@
 VERSION_INFO = (VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD)
 VERSION_STRING = "%d.%d.%d" % VERSION_INFO
 
-__version__ = VERSION_STRING
+__version__ = VERSION_INFO