diff options
author | Cyril Roelandt <cyril.roelandt@enovance.com> | 2014-03-19 15:02:40 +0100 |
---|---|---|
committer | Cyril Roelandt <cyril.roelandt@enovance.com> | 2014-04-09 17:32:52 +0200 |
commit | a03b141a954c7e644f0033defdb1b5b434a7c49a (patch) | |
tree | 3515ecc8ab1b2a2218b0fa60aec04de09def8ce5 /migrate/versioning/templates/manage | |
parent | 07909159ae22dc0d399b9618dcf0f79a1d0332bf (diff) | |
download | sqalchemy-migrate-a03b141a954c7e644f0033defdb1b5b434a7c49a.tar.gz |
Port to Python3
Brief summary of the modifications:
* Use six for compatibility with both Python 2 and 3;
* Replace UserDict.DictMixin with collections.MutableMapping;
* Fix relative imports;
* Use test-requirements.txt for requirements that are common to both Python 2
and 3, and test-requirements-py{2,3}.txt for version-specific requirements;
* Miscellaneous fixes.
* Use a specific test_db_py3.cfg file for Python 3, that only runs tests on
sqlite.
Thanks to Victor Stinner who co-wrote this patch.
Change-Id: Ia6dc536c39d274924c21fd5bb619e8e5721e04c4
Co-Authored-By: Victor Stinner <victor.stinner@enovance.com>
Diffstat (limited to 'migrate/versioning/templates/manage')
-rw-r--r-- | migrate/versioning/templates/manage/default.py_tmpl | 3 | ||||
-rw-r--r-- | migrate/versioning/templates/manage/pylons.py_tmpl | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/migrate/versioning/templates/manage/default.py_tmpl b/migrate/versioning/templates/manage/default.py_tmpl index f6d75c5..e72097a 100644 --- a/migrate/versioning/templates/manage/default.py_tmpl +++ b/migrate/versioning/templates/manage/default.py_tmpl @@ -2,10 +2,11 @@ from migrate.versioning.shell import main {{py: +import six _vars = locals().copy() del _vars['__template_name__'] _vars.pop('repository_name', None) -defaults = ", ".join(["%s='%s'" % var for var in _vars.iteritems()]) +defaults = ", ".join(["%s='%s'" % var for var in six.iteritems(_vars)]) }} if __name__ == '__main__': diff --git a/migrate/versioning/templates/manage/pylons.py_tmpl b/migrate/versioning/templates/manage/pylons.py_tmpl index cc2f788..ccaac05 100644 --- a/migrate/versioning/templates/manage/pylons.py_tmpl +++ b/migrate/versioning/templates/manage/pylons.py_tmpl @@ -17,9 +17,10 @@ else: conf_path = 'development.ini' {{py: +import six _vars = locals().copy() del _vars['__template_name__'] -defaults = ", ".join(["%s='%s'" % var for var in _vars.iteritems()]) +defaults = ", ".join(["%s='%s'" % var for var in six.iteritems(_vars)]) }} conf_dict = ConfigLoader(conf_path).parser._sections['app:main'] |