Reorganise and explicitly state what's importable
@@ -16,6 +16,11 @@ try:
except ImportError:
import copyreg as copy_reg
+pickle = pickle
+copy_reg = copy_reg
+CudaStream = CudaStream
+cupy = cupy
+fix_text = ftfy.fix_text
is_python2 = six.PY2
is_python3 = six.PY3
@@ -23,8 +28,6 @@ is_windows = sys.platform.startswith('win')
is_linux = sys.platform.startswith('linux')
is_osx = sys.platform == 'darwin'
-fix_text = ftfy.fix_text
-
if is_python2:
bytes_ = str
