Skip to content

Commit 9e11abd

Browse files
misl6accumulator
authored andcommitted
Remove six and enum34 dependency (kivy#2657)
1 parent 5403108 commit 9e11abd

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

pythonforandroid/recipe.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from os.path import basename, dirname, exists, isdir, isfile, join, realpath, split
22
import glob
33
from shutil import rmtree
4-
from six import with_metaclass
54

65
import hashlib
76
from re import match
@@ -40,7 +39,7 @@ def __new__(cls, name, bases, dct):
4039
return super().__new__(cls, name, bases, dct)
4140

4241

43-
class Recipe(with_metaclass(RecipeMeta)):
42+
class Recipe(metaclass=RecipeMeta):
4443
_url = None
4544
'''The address from which the recipe may be downloaded. This is not
4645
essential, it may be omitted if the source is available some other

pythonforandroid/toolchain.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ def check_python_dependencies():
2828

2929
ok = True
3030

31-
modules = [('colorama', '0.3.3'), 'appdirs', ('sh', '1.10'), 'jinja2',
32-
'six']
31+
modules = [('colorama', '0.3.3'), 'appdirs', ('sh', '1.10'), 'jinja2']
3332

3433
for module in modules:
3534
if isinstance(module, tuple):

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
# must be a single statement since buildozer is currently parsing it, refs:
2121
# https://github.com/kivy/buildozer/issues/722
2222
install_reqs = [
23-
'appdirs', 'colorama>=0.3.3', 'jinja2', 'six',
24-
'enum34; python_version<"3.4"', 'sh>=1.10; sys_platform!="nt"',
23+
'appdirs', 'colorama>=0.3.3', 'jinja2',
24+
'sh>=1.10; sys_platform!="nt"',
2525
'pep517<0.7.0', 'toml',
2626
]
2727
# (pep517 and toml are used by pythonpackage.py)

0 commit comments

Comments
 (0)