From: Kefu Chai <kchai@redhat.com>
Date: Wed, 9 Nov 2016 11:08:29 +0000 (+0800)
Subject: pybind: rename rgw_file.pyx to rgw.pyx
X-Git-Tag: v11.1.0~366^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cb351a923b4e1f35e80e6cfdc59361fcb0ec290d;p=ceph.git

pybind: rename rgw_file.pyx to rgw.pyx

so the init function offered by rgw python extension is named "initrgw"
instead of "initrgw_file". and "initrgw" is the expected name by python
intepreter when loading an extension.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/pybind/rgw/CMakeLists.txt b/src/pybind/rgw/CMakeLists.txt
index 33213edcbd5f..da2cdcdf87f3 100644
--- a/src/pybind/rgw/CMakeLists.txt
+++ b/src/pybind/rgw/CMakeLists.txt
@@ -1,3 +1,3 @@
-distutils_add_cython_module(cython${PYTHON_VERSION}_rgw ${CMAKE_CURRENT_SOURCE_DIR}/rgw_file.pyx)
+distutils_add_cython_module(cython${PYTHON_VERSION}_rgw ${CMAKE_CURRENT_SOURCE_DIR}/rgw.pyx)
 add_dependencies(cython${PYTHON_VERSION}_rgw rgw)
 distutils_install_cython_module(cython${PYTHON_VERSION}_rgw)
diff --git a/src/pybind/rgw/MANIFEST.in b/src/pybind/rgw/MANIFEST.in
index c95228fcdb31..330f3fd19851 100644
--- a/src/pybind/rgw/MANIFEST.in
+++ b/src/pybind/rgw/MANIFEST.in
@@ -1 +1 @@
-include rgw_file.pyx
+include rgw.pyx
diff --git a/src/pybind/rgw/setup.py b/src/pybind/rgw/setup.py
index 72bace4f0be3..f14f30c89660 100755
--- a/src/pybind/rgw/setup.py
+++ b/src/pybind/rgw/setup.py
@@ -146,7 +146,7 @@ except ImportError:
 
         source = "rgw.c"
 else:
-    source = "rgw_file.pyx"
+    source = "rgw.pyx"
 
 # Disable cythonification if we're not really building anything
 if (len(sys.argv) >= 2 and