summaryrefslogtreecommitdiff
path: root/django/utils/version.py
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-10-25 21:44:48 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-10-25 21:49:18 +0200
commit45c8818503ebda101e7ff0f642c18880dd323669 (patch)
tree23fb17a276c5f10eb16f79368a1ace8b1e6c22bd /django/utils/version.py
parente8b258895adec3d892ada30722517976b298e420 (diff)
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).
Diffstat (limited to 'django/utils/version.py')
-rw-r--r--django/utils/version.py2
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.