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

[1.8.x] Fixed "environment can only contain strings" in model_regress test on Windows. 

Backport of ad50b6c853 from master
This commit is contained in:
Tim Graham 2015-02-17 13:54:18 -05:00
parent e4df10668c
commit ec9119d4ec
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/model_regress/test_pickle.py
View File

@ -88,7 +88,7 @@ print(article.headline)"""
str('PYTHONPATH'): os.pathsep.join(sys.path), str('PYTHONPATH'): os.pathsep.join(sys.path),
# Needed on Windows because http://bugs.python.org/issue8557 # Needed on Windows because http://bugs.python.org/issue8557
str('PATH'): os.environ['PATH'], str('PATH'): os.environ['PATH'],
str('LANG'): os.environ.get('LANG'), str('LANG'): os.environ.get('LANG', ''),
} }
if 'SYSTEMROOT' in os.environ: # Windows http://bugs.python.org/issue20614 if 'SYSTEMROOT' in os.environ: # Windows http://bugs.python.org/issue20614
env[str('SYSTEMROOT')] = os.environ['SYSTEMROOT'] env[str('SYSTEMROOT')] = os.environ['SYSTEMROOT']