Adjust the build process to be py2/py3 compatible.

diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
index 5863336..551c6ed 100644 (file)
--- a/src/python/CMakeLists.txt
+++ b/src/python/CMakeLists.txt
@@ -40,15 +40,15 @@ SET (createrepo_cmodule_SRCS
      xml_parser-py.c
     )
 
-ADD_LIBRARY(_createrepo_cmodule SHARED ${createrepo_cmodule_SRCS})
-SET_TARGET_PROPERTIES(_createrepo_cmodule PROPERTIES PREFIX "")
-SET_TARGET_PROPERTIES(_createrepo_cmodule PROPERTIES LIBRARY_OUTPUT_DIRECTORY "./createrepo_c")
-TARGET_LINK_LIBRARIES(_createrepo_cmodule libcreaterepo_c)
-TARGET_LINK_LIBRARIES(_createrepo_cmodule
+ADD_LIBRARY(_createrepo_c SHARED ${createrepo_cmodule_SRCS})
+SET_TARGET_PROPERTIES(_createrepo_c PROPERTIES PREFIX "")
+SET_TARGET_PROPERTIES(_createrepo_c PROPERTIES LIBRARY_OUTPUT_DIRECTORY "./createrepo_c")
+TARGET_LINK_LIBRARIES(_createrepo_c libcreaterepo_c)
+TARGET_LINK_LIBRARIES(_createrepo_c
                         ${EXPAT_LIBRARIES}
                         ${CURL_LIBRARY}
                         ${PYTHON_LIBRARY}
                      )
 
 INSTALL(FILES __init__.py DESTINATION ${PYTHON_INSTALL_DIR}/createrepo_c)
-INSTALL(TARGETS _createrepo_cmodule LIBRARY DESTINATION ${PYTHON_INSTALL_DIR}/createrepo_c)
+INSTALL(TARGETS _createrepo_c LIBRARY DESTINATION ${PYTHON_INSTALL_DIR}/createrepo_c)

diff --git a/src/python/__init__.py b/src/python/__init__.py
index 763dd9f..6c29e74 100644 (file)
--- a/src/python/__init__.py
+++ b/src/python/__init__.py
@@ -1,8 +1,8 @@
 """
 """
 
-import _createrepo_c
-from _createrepo_c import *
+from . import _createrepo_c
+from ._createrepo_c import *
 
 VERSION_MAJOR = _createrepo_c.VERSION_MAJOR  #: Major version
 VERSION_MINOR = _createrepo_c.VERSION_MINOR  #: Minor version