pybind: Silence distutils/setuptools warning

Setuptools would very much like to be imported BEFORE distutils

So move the conditional imports of setuptools above the import of
distutils.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

diff --git a/src/pybind/cephfs/setup.py b/src/pybind/cephfs/setup.py
index 40466614f67a93b6aa23a2b7d6c0687cbd42c4b9..4eec949731a365c3b916d8b450b723347fca501d 100755 (executable)
--- a/src/pybind/cephfs/setup.py
+++ b/src/pybind/cephfs/setup.py
@@ -7,6 +7,12 @@ import subprocess
 import sys
 import tempfile
 import textwrap
+if not pkgutil.find_loader('setuptools'):
+    from distutils.core import setup
+    from distutils.extension import Extension
+else:
+    from setuptools import setup
+    from setuptools.extension import Extension
 from distutils.ccompiler import new_compiler
 from distutils.errors import CompileError, LinkError
 from itertools import filterfalse, takewhile
@@ -45,13 +51,6 @@ def monkey_with_compiler(customize):
 distutils.sysconfig.customize_compiler = \
     monkey_with_compiler(distutils.sysconfig.customize_compiler)
 
-if not pkgutil.find_loader('setuptools'):
-    from distutils.core import setup
-    from distutils.extension import Extension
-else:
-    from setuptools import setup
-    from setuptools.extension import Extension
-
 # PEP 440 versioning of the Ceph FS package on PyPI
 # Bump this version, after every changeset
 

diff --git a/src/pybind/rados/setup.py b/src/pybind/rados/setup.py
index 5b40a806e60181ee69e63cd07983c378d8ca1fa1..66682b15b6c459caed75627f6ee0935237849c39 100755 (executable)
--- a/src/pybind/rados/setup.py
+++ b/src/pybind/rados/setup.py
@@ -1,11 +1,17 @@
 from __future__ import print_function
+import pkgutil
+if not pkgutil.find_loader('setuptools'):
+    from distutils.core import setup
+    from distutils.extension import Extension
+else:
+    from setuptools import setup
+    from setuptools.extension import Extension
 import distutils.sysconfig
 from distutils.errors import CompileError, LinkError
 from distutils.ccompiler import new_compiler
 from itertools import filterfalse, takewhile
 
 import os
-import pkgutil
 import shutil
 import subprocess
 import sys
@@ -45,14 +51,6 @@ def monkey_with_compiler(customize):
 distutils.sysconfig.customize_compiler = \
     monkey_with_compiler(distutils.sysconfig.customize_compiler)
 
-if not pkgutil.find_loader('setuptools'):
-    from distutils.core import setup
-    from distutils.extension import Extension
-else:
-    from setuptools import setup
-    from setuptools.extension import Extension
-
-
 distutils.sysconfig.customize_compiler = \
     monkey_with_compiler(distutils.sysconfig.customize_compiler)
 

diff --git a/src/pybind/rbd/setup.py b/src/pybind/rbd/setup.py
index 1f4d9ed79825bbc2254010364bd0b57d305dab35..60c47c1a9c9328dcd3d15871bc59b7f38d2fe210 100755 (executable)
--- a/src/pybind/rbd/setup.py
+++ b/src/pybind/rbd/setup.py
@@ -7,6 +7,12 @@ import subprocess
 import sys
 import tempfile
 import textwrap
+if not pkgutil.find_loader('setuptools'):
+    from distutils.core import setup
+    from distutils.extension import Extension
+else:
+    from setuptools import setup
+    from setuptools.extension import Extension
 from distutils.ccompiler import new_compiler
 from distutils.errors import CompileError, LinkError
 from itertools import filterfalse, takewhile
@@ -45,13 +51,6 @@ def monkey_with_compiler(customize):
 distutils.sysconfig.customize_compiler = \
     monkey_with_compiler(distutils.sysconfig.customize_compiler)
 
-if not pkgutil.find_loader('setuptools'):
-    from distutils.core import setup
-    from distutils.extension import Extension
-else:
-    from setuptools import setup
-    from setuptools.extension import Extension
-
 # PEP 440 versioning of the RBD package on PyPI
 # Bump this version, after every changeset
 

diff --git a/src/pybind/rgw/setup.py b/src/pybind/rgw/setup.py
index d53aec7f84c120a4e4d5ead02b8a7868e8d09014..518fa9f81bc2276be97132509ab7a6eee0d2644d 100755 (executable)
--- a/src/pybind/rgw/setup.py
+++ b/src/pybind/rgw/setup.py
@@ -1,8 +1,14 @@
 from __future__ import print_function
+import pkgutil
+if not pkgutil.find_loader('setuptools'):
+    from distutils.core import setup
+    from distutils.extension import Extension
+else:
+    from setuptools import setup
+    from setuptools.extension import Extension
 import distutils.core
 
 import os
-import pkgutil
 import shutil
 import subprocess
 import sys
@@ -46,13 +52,6 @@ def monkey_with_compiler(customize):
 distutils.sysconfig.customize_compiler = \
     monkey_with_compiler(distutils.sysconfig.customize_compiler)
 
-if not pkgutil.find_loader('setuptools'):
-    from distutils.core import setup
-    from distutils.extension import Extension
-else:
-    from setuptools import setup
-    from setuptools.extension import Extension
-
 # PEP 440 versioning of the RGW package on PyPI
 # Bump this version, after every changeset