summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-08-19 18:57:56 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-08-19 18:57:56 (GMT)
commitc4fe6f39612b58d2a4a9caf20e651551dd46ed48 (patch)
tree55cb677e33d4c88b1673d530a64343813b55f717 /Lib/test
parentee58fa484ed535ec6d7f2b93cb3ef2addeb337e1 (diff)
downloadcpython-c4fe6f39612b58d2a4a9caf20e651551dd46ed48.zip
cpython-c4fe6f39612b58d2a4a9caf20e651551dd46ed48.tar.gz
cpython-c4fe6f39612b58d2a4a9caf20e651551dd46ed48.tar.bz2
Merged revisions 65780,65782,65785,65809,65812,65834,65846,65859,65861 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r65780 | antoine.pitrou | 2008-08-17 15:15:07 -0500 (Sun, 17 Aug 2008) | 3 lines #3580: fix a failure in test_os ........ r65782 | benjamin.peterson | 2008-08-17 15:33:45 -0500 (Sun, 17 Aug 2008) | 1 line set svn:executable on a script ........ r65785 | amaury.forgeotdarc | 2008-08-17 16:05:18 -0500 (Sun, 17 Aug 2008) | 3 lines Fix a refleak in bytearray.split and bytearray.rsplit, detected by regrtest.py -R:: test_bytes ........ r65809 | nick.coghlan | 2008-08-18 07:42:46 -0500 (Mon, 18 Aug 2008) | 1 line Belated NEWS entry for r65642 ........ r65812 | nick.coghlan | 2008-08-18 08:32:19 -0500 (Mon, 18 Aug 2008) | 1 line Fix typo ........ r65834 | amaury.forgeotdarc | 2008-08-18 14:23:47 -0500 (Mon, 18 Aug 2008) | 4 lines #2234 distutils failed with mingw binutils 2.18.50.20080109. Be less strict when parsing these version numbers, they don't necessarily follow the python numbering scheme. ........ r65846 | georg.brandl | 2008-08-18 18:09:49 -0500 (Mon, 18 Aug 2008) | 2 lines Fix grammar. ........ r65859 | thomas.heller | 2008-08-19 12:47:13 -0500 (Tue, 19 Aug 2008) | 2 lines Fix strange character in the docstring. ........ r65861 | benjamin.peterson | 2008-08-19 12:59:23 -0500 (Tue, 19 Aug 2008) | 1 line get unparse to at least unparse its self ........
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_os.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index ca23dba..3dffcb2 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -318,7 +318,7 @@ class StatAttributeTests(unittest.TestCase):
try:
os.stat(r"c:\pagefile.sys")
except WindowsError as e:
- if e == 2: # file does not exist; cannot run test
+ if e.errno == 2: # file does not exist; cannot run test
return
self.fail("Could not stat pagefile.sys")