diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2012-10-25 21:44:48 +0200 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2012-10-25 21:49:57 +0200 |
| commit | 9edec9e75d3fdb7390b30872bc0f849de0251ec4 (patch) | |
| tree | aaa0c6b47115232f59e39ebd3fd258df82c19838 | |
| parent | d7f8894465f9a5ce6450c0f3965855355c87feae (diff) | |
[1.5.x] Ensured get_version returns a native string.
Returning unicode triggers a bug in Python 2.7:
http://bugs.python.org/issue11638
This problem was introduced in 4a103086 (unicode_literals).
Backport of 45c8818 from master.
| -rw-r--r-- | django/utils/version.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/utils/version.py b/django/utils/version.py index 2271d415db..e0a8286e48 100644 --- a/django/utils/version.py +++ b/django/utils/version.py @@ -30,7 +30,7 @@ def get_version(version=None): mapping = {'alpha': 'a', 'beta': 'b', 'rc': 'c'} sub = mapping[version[3]] + str(version[4]) - return main + sub + return str(main + sub) def get_git_changeset(): """Returns a numeric identifier of the latest git changeset. |