[pypy-commit] pypy win32-cleanup2: windir can be lower case on windows 7

mattip noreply at buildbot.pypy.org
Sun Apr 8 13:09:00 CEST 2012


Author: Matti Picus <matti.picus at gmail.com>
Branch: win32-cleanup2
Changeset: r54247:10aecff7bec5
Date: 2012-04-08 13:45 +0300
http://bitbucket.org/pypy/pypy/changeset/10aecff7bec5/

Log:	windir can be lower case on windows 7

diff --git a/pypy/module/_winreg/test/test_winreg.py b/pypy/module/_winreg/test/test_winreg.py
--- a/pypy/module/_winreg/test/test_winreg.py
+++ b/pypy/module/_winreg/test/test_winreg.py
@@ -198,7 +198,10 @@
         import nt
         r = ExpandEnvironmentStrings(u"%windir%\\test")
         assert isinstance(r, unicode)
-        assert r == nt.environ["WINDIR"] + "\\test"
+        if 'WINDIR' in nt.environ.keys():
+            assert r == nt.environ["WINDIR"] + "\\test"
+        else:
+            assert r == nt.environ["windir"] + "\\test"
 
     def test_long_key(self):
         from _winreg import (


More information about the pypy-commit mailing list