Import changes to work with setup.py

inclement · inclement · commit ffaf102ecb78 · 2015-10-04T14:14:35.000+01:00
diff --git a/doc/source/recipes.rst b/doc/source/recipes.rst
@@ -85,7 +85,7 @@ directory, which you can access with
 this directory. It may be convenient to use the ``current_directory``
 context manager defined in toolchain.py::
 
-  from toolchain import current_directory
+  from pythonforandroid.toolchain import current_directory
   def build_arch(self, arch):
       super(YourRecipe, self).build_arch(arch)
       with current_directory(self.get_build_dir(arch.arch)):
@@ -162,7 +162,7 @@ You can also use the ``shprint`` helper function from the p4a
 toolchain module, which will print information about the process and
 its current status::
 
-  from toolchain import shprint
+  from pythonforandroid.toolchain import shprint
   shprint(sh.echo, '$PATH', _env=env)
 
 You can also override the ``get_recipe_env`` method to add new env
@@ -227,7 +227,7 @@ install`` with an appropriate environment.
 For instance, the following is all that's necessary to create a recipe
 for the Vispy module::
 
-  from toolchain import PythonRecipe
+  from pythonforandroid.toolchain import PythonRecipe
   class VispyRecipe(PythonRecipe):
       version = 'master'
       url = 'https://github.com/vispy/vispy/archive/{version}.zip'
@@ -388,7 +388,7 @@ The following template includes all the recipe sections you might
 use. Note that none are compulsory, feel free to delete method
 overrides if you do not use them::
 
-    from toolchain import Recipe, shprint, current_directory
+    from pythonforandroid.toolchain import Recipe, shprint, current_directory
     from os.path import exists, join
     import sh
     import glob
diff --git a/pythonforandroid/bootstraps/pygame/__init__.py b/pythonforandroid/bootstraps/pygame/__init__.py
@@ -1,4 +1,4 @@
-from toolchain import Bootstrap, shprint, current_directory, info, warning, ArchAndroid, logger, info_main, which
+from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchAndroid, logger, info_main, which
 from os.path import join, exists
 from os import walk
 import glob
diff --git a/pythonforandroid/bootstraps/sdl2/__init__.py b/pythonforandroid/bootstraps/sdl2/__init__.py
@@ -1,4 +1,4 @@
-from toolchain import Bootstrap, shprint, current_directory, info, warning, ArchAndroid, logger, info_main, which
+from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchAndroid, logger, info_main, which
 from os.path import join, exists
 from os import walk
 import glob
diff --git a/pythonforandroid/recipes/android/__init__.py b/pythonforandroid/recipes/android/__init__.py
@@ -1,5 +1,5 @@
 
-from toolchain import CythonRecipe, shprint, ensure_dir, current_directory, ArchAndroid, IncludedFilesBehaviour
+from pythonforandroid.toolchain import CythonRecipe, shprint, ensure_dir, current_directory, ArchAndroid, IncludedFilesBehaviour
 import sh
 from os.path import exists, join
 
diff --git a/pythonforandroid/recipes/androidsdl2/__init__.py b/pythonforandroid/recipes/androidsdl2/__init__.py
@@ -1,5 +1,5 @@
 
-from toolchain import PythonRecipe, shprint, ensure_dir, current_directory, ArchAndroid, IncludedFilesBehaviour
+from pythonforandroid.toolchain import PythonRecipe, shprint, ensure_dir, current_directory, ArchAndroid, IncludedFilesBehaviour
 import sh
 from os.path import exists, join
 
diff --git a/pythonforandroid/recipes/hostpython2/__init__.py b/pythonforandroid/recipes/hostpython2/__init__.py
@@ -1,5 +1,5 @@
 
-from toolchain import Recipe, shprint, get_directory, current_directory, info, warning
+from pythonforandroid.toolchain import Recipe, shprint, get_directory, current_directory, info, warning
 from os.path import join, exists
 from os import chdir
 import sh
diff --git a/pythonforandroid/recipes/kivy/__init__.py b/pythonforandroid/recipes/kivy/__init__.py
@@ -1,5 +1,5 @@
 
-from toolchain import CythonRecipe, shprint, current_directory, ArchAndroid
+from pythonforandroid.toolchain import CythonRecipe, shprint, current_directory, ArchAndroid
 from os.path import exists, join
 import sh
 import glob
diff --git a/pythonforandroid/recipes/kivysdl2/__init__.py b/pythonforandroid/recipes/kivysdl2/__init__.py
@@ -1,5 +1,5 @@
 
-from toolchain import CythonRecipe, shprint, current_directory, ArchAndroid
+from pythonforandroid.toolchain import CythonRecipe, shprint, current_directory, ArchAndroid
 from os.path import exists, join
 import sh
 import glob
diff --git a/pythonforandroid/recipes/pygame/__init__.py b/pythonforandroid/recipes/pygame/__init__.py
@@ -1,5 +1,5 @@
 
-from toolchain import Recipe, shprint, ArchAndroid, current_directory, debug, info, ensure_dir
+from pythonforandroid.toolchain import Recipe, shprint, ArchAndroid, current_directory, debug, info, ensure_dir
 from os.path import exists, join
 import sh
 import glob
diff --git a/pythonforandroid/recipes/pygame_bootstrap_components/__init__.py b/pythonforandroid/recipes/pygame_bootstrap_components/__init__.py
@@ -1,4 +1,4 @@
-from toolchain import NDKRecipe, current_directory, shprint, info
+from pythonforandroid.toolchain import NDKRecipe, current_directory, shprint, info
 from os.path import exists, join
 import sh
 import glob
diff --git a/pythonforandroid/recipes/pyjnius/__init__.py b/pythonforandroid/recipes/pyjnius/__init__.py
@@ -1,5 +1,5 @@
 
-from toolchain import CythonRecipe, shprint, ArchAndroid, current_directory, info
+from pythonforandroid.toolchain import CythonRecipe, shprint, ArchAndroid, current_directory, info
 import sh
 import glob
 from os.path import join, exists
diff --git a/pythonforandroid/recipes/pyjniussdl2/__init__.py b/pythonforandroid/recipes/pyjniussdl2/__init__.py
@@ -1,5 +1,5 @@
 
-from toolchain import CythonRecipe, shprint, ArchAndroid, current_directory, info
+from pythonforandroid.toolchain import CythonRecipe, shprint, ArchAndroid, current_directory, info
 import sh
 import glob
 from os.path import join, exists
diff --git a/pythonforandroid/recipes/python2/__init__.py b/pythonforandroid/recipes/python2/__init__.py
@@ -1,5 +1,5 @@
 
-from toolchain import Recipe, shprint, get_directory, current_directory, ArchAndroid
+from pythonforandroid.toolchain import Recipe, shprint, get_directory, current_directory, ArchAndroid
 from os.path import exists, join
 from os import uname
 import sh
diff --git a/pythonforandroid/recipes/sdl/__init__.py b/pythonforandroid/recipes/sdl/__init__.py
@@ -1,4 +1,4 @@
-from toolchain import NDKRecipe, shprint, ArchAndroid, current_directory, info
+from pythonforandroid.toolchain import NDKRecipe, shprint, ArchAndroid, current_directory, info
 from os.path import exists, join
 import sh
 
diff --git a/pythonforandroid/recipes/sdl2/__init__.py b/pythonforandroid/recipes/sdl2/__init__.py
@@ -1,4 +1,4 @@
-from toolchain import NDKRecipe, shprint, current_directory, info_main
+from pythonforandroid.toolchain import NDKRecipe, shprint, current_directory, info_main
 from os.path import exists, join
 import sh
 
diff --git a/pythonforandroid/recipes/sdl2_image/__init__.py b/pythonforandroid/recipes/sdl2_image/__init__.py
@@ -1,4 +1,4 @@
-from toolchain import NDKRecipe, shprint
+from pythonforandroid.toolchain import NDKRecipe, shprint
 from os.path import exists, join
 import sh
 
diff --git a/pythonforandroid/recipes/sdl2_mixer/__init__.py b/pythonforandroid/recipes/sdl2_mixer/__init__.py
@@ -1,5 +1,5 @@
 
-from toolchain import NDKRecipe, shprint
+from pythonforandroid.toolchain import NDKRecipe, shprint
 from os.path import exists, join
 import sh
 
diff --git a/pythonforandroid/recipes/sdl2_ttf/__init__.py b/pythonforandroid/recipes/sdl2_ttf/__init__.py
@@ -1,4 +1,4 @@
-from toolchain import NDKRecipe
+from pythonforandroid.toolchain import NDKRecipe
 from os.path import exists
 
 class LibSDL2TTF(NDKRecipe):
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
@@ -31,7 +31,6 @@
 
 import argparse
 
-import requests
 from appdirs import user_data_dir
 
 curdir = dirname(__file__)
@@ -1309,7 +1308,7 @@ def get_recipe(cls, name, ctx):
            cls.recipes = {}
         if name in cls.recipes:
             return cls.recipes[name]
-        mod = importlib.import_module("recipes.{}".format(name))
+        mod = importlib.import_module("pythonforandroid.recipes.{}".format(name))
         if len(logger.handlers) > 1:
             logger.removeHandler(logger.handlers[1])
         recipe = mod.recipe

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from toolchain import Bootstrap, shprint, current_directory, info, warning, ArchAndroid, logger, info_main, which`
	`1`	`+from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchAndroid, logger, info_main, which`
`2`	`2`	`from os.path import join, exists`
`3`	`3`	`from os import walk`
`4`	`4`	`import glob`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from toolchain import NDKRecipe, current_directory, shprint, info`
	`1`	`+from pythonforandroid.toolchain import NDKRecipe, current_directory, shprint, info`
`2`	`2`	`from os.path import exists, join`
`3`	`3`	`import sh`
`4`	`4`	`import glob`