Merge branch 'master' of https://github.com/kivy/buildozer

README.rst

@@ -49,7 +49,7 @@ The pip package does not yet support python3.
     git clone https://github.com/kivy/buildozer
     cd buildozer
     python setup.py build
-    sudo pip install -e 
+    sudo pip install -e .
 
 #. Download and extract the Crystax NDK somewhere (~/.buildozer/crystax-ndk is one option): https://www.crystax.net/en/download
 #. Go into your application directory and execute::

buildozer/__init__.py

@@ -489,10 +489,6 @@ class Buildozer(object):
 
     def _install_application_requirement(self, module):
         self._ensure_virtualenv()
-        # resetup distribute, just in case
-        self.debug('Install distribute')
-        self.cmd('curl http://python-distribute.org/distribute_setup.py | venv/bin/python', get_stdout=True, cwd=self.buildozer_dir)
-
         self.debug('Install requirement {} in virtualenv'.format(module))
         self.cmd('pip install --target={} {}'.format(self.applibs_dir, module),
                  env=self.env_venv,

buildozer/targets/android.py

@@ -819,10 +819,9 @@ class TargetAndroid(Target):
 
         # recreate the project.properties
         with io.open(project_fn, 'w', encoding='utf-8') as fd:
-            fd.writelines(content)
+            fd.writelines((line.encode('utf-8') for line in content))
             for index, ref in enumerate(references):
-                fd.write(u'android.library.reference.{}={}\n'.format(index + 1,
-                                                                     ref))
+                fd.write(u'android.library.reference.{}={}\n'.format(index + 1, ref))
 
         self.buildozer.debug('project.properties updated')
 
@@ -890,8 +889,8 @@ class TargetAndroid(Target):
         for serial in self.serials:
             self.buildozer.environ['ANDROID_SERIAL'] = serial
             self.buildozer.info('Deploy on {}'.format(serial))
-            self.buildozer.cmd('{0} install -r {1}'.format(self.adb_cmd,
-                                                           full_apk),
+            self.buildozer.cmd('{0} install -r "{1}"'.format(
+                               self.adb_cmd, full_apk),
                                cwd=self.buildozer.global_platform_dir)
         self.buildozer.environ.pop('ANDROID_SERIAL', None)
 
@@ -938,4 +937,3 @@ class TargetAndroid(Target):
 
 def get_target(buildozer):
     return TargetAndroid(buildozer)
-