summaryrefslogtreecommitdiffstats
path: root/Lib/platform.py
diff options
context:
space:
mode:
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>2008-06-17 21:42:46 (GMT)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>2008-06-17 21:42:46 (GMT)
commit7a01984aba532b731dd6a06610b0ce523bef4f5e (patch)
tree938555e3cd1afadb50666681b3278b7fbf0b441d /Lib/platform.py
parentbf9e966228c6faa440e1c9b5fa8c41d0be8a721b (diff)
downloadcpython-7a01984aba532b731dd6a06610b0ce523bef4f5e.zip
cpython-7a01984aba532b731dd6a06610b0ce523bef4f5e.tar.gz
cpython-7a01984aba532b731dd6a06610b0ce523bef4f5e.tar.bz2
Merge error: platform.py would not import
Diffstat (limited to 'Lib/platform.py')
-rwxr-xr-xLib/platform.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/platform.py b/Lib/platform.py
index 33033ff..ff81d28 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -1089,7 +1089,7 @@ def uname():
node = _node()
machine = ''
- use_syscmd_ver = 01
+ use_syscmd_ver = 1
# Try win32_ver() on win32 platforms
if system == 'win32':