p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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.
This commit is contained in:
Aymeric Augustin 2012-10-25 21:44:48 +02:00
parent d7f8894465
commit 9edec9e75d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/utils/version.py
View File

@ -30,7 +30,7 @@ def get_version(version=None):
mapping = {'alpha': 'a', 'beta': 'b', 'rc': 'c'} mapping = {'alpha': 'a', 'beta': 'b', 'rc': 'c'}
sub = mapping[version[3]] + str(version[4]) sub = mapping[version[3]] + str(version[4])
return main + sub return str(main + sub)
def get_git_changeset(): def get_git_changeset():
"""Returns a numeric identifier of the latest git changeset. """Returns a numeric identifier of the latest git changeset.