diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | dbus/__init__.py | 8 | ||||
| -rw-r--r-- | dbus/_version.py.in | 3 |
5 files changed, 3 insertions, 11 deletions
@@ -29,7 +29,6 @@ /dbus-python-*.tar.gz.asc /dbus-python.pc /dbus/.doc-needs-rebuild-stamp -/dbus/_version.py /depcomp /install-sh /libtool diff --git a/Makefile.am b/Makefile.am index 2e48fce..851b894 100644 --- a/Makefile.am +++ b/Makefile.am @@ -153,7 +153,6 @@ nobase_python_PYTHON = \ dbus/connection.py \ dbus/_compat.py \ dbus/_dbus.py \ - dbus/_version.py \ dbus/decorators.py \ dbus/exceptions.py \ dbus/_expat_introspect_parser.py \ diff --git a/configure.ac b/configure.ac index b929432..ae8c210 100644 --- a/configure.ac +++ b/configure.ac @@ -216,6 +216,5 @@ AC_ARG_ENABLE([coding-style-checks], AC_CONFIG_FILES([ Makefile dbus-python.pc - dbus/_version.py ]) AC_OUTPUT diff --git a/dbus/__init__.py b/dbus/__init__.py index eb9717a..e96bd99 100644 --- a/dbus/__init__.py +++ b/dbus/__init__.py @@ -72,15 +72,13 @@ if is_py2: __docformat__ = 'restructuredtext' -try: - from dbus._version import version, __version__ -except ImportError: - pass - # OLPC Sugar compatibility import dbus.exceptions as exceptions import dbus.types as types +from _dbus_bindings import __version__ +version = tuple(map(int, __version__.split('.'))) + from _dbus_bindings import ( get_default_main_loop, set_default_main_loop, validate_bus_name, validate_error_name, validate_interface_name, validate_member_name, diff --git a/dbus/_version.py.in b/dbus/_version.py.in deleted file mode 100644 index 9b3e466..0000000 --- a/dbus/_version.py.in +++ /dev/null @@ -1,3 +0,0 @@ -# @configure_input@ -__version__ = "@PACKAGE_VERSION@" -version = tuple(map(int, __version__.split('.'))) |