diff options
| author | Rémi Duraffort <remi.duraffort@linaro.org> | 2016-08-08 16:31:55 +0200 |
|---|---|---|
| committer | Rémi Duraffort <remi.duraffort@linaro.org> | 2016-08-09 10:44:12 +0200 |
| commit | 6141bce20e6689250f68b2757e18204c82113949 (patch) | |
| tree | cc649b54af6e0487b46aadf0300fac4db2e63bc2 | |
| parent | 0f6f00d3e778a0f0e897c65c5df408734a38cf67 (diff) | |
Port to Python3 and remove support for python2.6
Change-Id: Ieb10400a205442498eadd238348628a6880c99c4
| -rw-r--r-- | .gitreview | 4 | ||||
| -rw-r--r-- | django_testproject/settings.py | 4 | ||||
| -rwxr-xr-x | setup.py | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..3ead5dd --- /dev/null +++ b/.gitreview @@ -0,0 +1,4 @@ +[gerrit] +host=review.linaro.org +port=29418 +project=lava/django-testproject diff --git a/django_testproject/settings.py b/django_testproject/settings.py index 2a875be..97be269 100644 --- a/django_testproject/settings.py +++ b/django_testproject/settings.py @@ -109,13 +109,13 @@ def gen_settings(**kwargs): settings = _get_default_settings(project_dir) # Merge with user provided defaults - for key, value in kwargs.iteritems(): + for key, value in kwargs.items(): if key not in settings: new_value = value elif isinstance(settings[key], (list, tuple)) and isinstance(value, (list, tuple)): # Merge lists new_value = list(settings[key]) + list(value) - elif isinstance(settings[key], (int, float, bool, basestring)) and isinstance(value, (int, float, bool, basestring)): + elif isinstance(settings[key], (int, float, bool, str)) and isinstance(value, (int, float, bool, str)): # Overwrite simple types new_value = value else: @@ -36,8 +36,9 @@ setup( 'Intended Audience :: Developers', "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)", "Operating System :: OS Independent", - "Programming Language :: Python :: 2.6", "Programming Language :: Python :: 2.7", + "Programming Language :: Python :: 3.4", + "Programming Language :: Python :: 3.5", "Topic :: Software Development :: Testing", ], zip_safe=True, @@ -45,7 +46,7 @@ setup( 'django_testproject', ], install_requires=[ - 'django >= 1.0', + 'django >= 1.5', ], include_package_data=True, ) |