Mailing List Archive

Update of /cvsroot/python/python/dist/src/Lib/test
In directory usw-pr-cvs1:/tmp/cvs-serv25501/Lib/test

Modified Files:
Tag: release22-maint
pickletester.py test_StringIO.py test_cfgparser.py
test_generators.py test_httplib.py test_multifile.py
test_netrc.py test_string.py test_trace.py test_urlparse.py
Log Message:
Whitespace normalization.


Index: pickletester.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/pickletester.py,v
retrieving revision 1.12.4.2
retrieving revision 1.12.4.3
diff -C2 -d -r1.12.4.2 -r1.12.4.3
*** pickletester.py 7 Mar 2002 10:12:38 -0000 1.12.4.2
--- pickletester.py 7 Oct 2002 01:18:17 -0000 1.12.4.3
***************
*** 254,258 ****
s = self.dumps(t)
u = self.loads(s)
! self.assertEqual(t, u)
import os
if hasattr(os, "stat"):
--- 254,258 ----
s = self.dumps(t)
u = self.loads(s)
! self.assertEqual(t, u)
import os
if hasattr(os, "stat"):

Index: test_StringIO.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_StringIO.py,v
retrieving revision 1.10.6.2
retrieving revision 1.10.6.3
diff -C2 -d -r1.10.6.2 -r1.10.6.3
*** test_StringIO.py 18 Mar 2002 13:31:31 -0000 1.10.6.2
--- test_StringIO.py 7 Oct 2002 01:18:17 -0000 1.10.6.3
***************
*** 78,82 ****
# snippets to larger Unicode strings. This is tested by this
# method. Note that cStringIO does not support this extension.
!
f = self.MODULE.StringIO()
f.write(self._line[:6])
--- 78,82 ----
# snippets to larger Unicode strings. This is tested by this
# method. Note that cStringIO does not support this extension.
!
f = self.MODULE.StringIO()
f.write(self._line[:6])

Index: test_cfgparser.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_cfgparser.py,v
retrieving revision 1.9.10.3
retrieving revision 1.9.10.4
diff -C2 -d -r1.9.10.3 -r1.9.10.4
*** test_cfgparser.py 27 Sep 2002 16:34:30 -0000 1.9.10.3
--- test_cfgparser.py 7 Oct 2002 01:18:17 -0000 1.9.10.4
***************
*** 71,75 ****
likes it.
""")
!
def case_sensitivity():
print "Testing case sensitivity..."
--- 71,75 ----
likes it.
""")
!
def case_sensitivity():
print "Testing case sensitivity..."

Index: test_generators.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_generators.py,v
retrieving revision 1.30.6.1
retrieving revision 1.30.6.2
diff -C2 -d -r1.30.6.1 -r1.30.6.2
*** test_generators.py 12 Jun 2002 03:48:46 -0000 1.30.6.1
--- test_generators.py 7 Oct 2002 01:18:17 -0000 1.30.6.2
***************
*** 817,821 ****
... finally:
... yield i
! ...
>>> g = f()
>>> print g.next()
--- 817,821 ----
... finally:
... yield i
! ...
>>> g = f()
>>> print g.next()

Index: test_httplib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_httplib.py,v
retrieving revision 1.2.12.2
retrieving revision 1.2.12.3
diff -C2 -d -r1.2.12.2 -r1.2.12.3
*** test_httplib.py 12 Jul 2002 14:23:43 -0000 1.2.12.2
--- test_httplib.py 7 Oct 2002 01:18:17 -0000 1.2.12.3
***************
*** 57,59 ****
if cookies != hdr:
raise AssertionError, "multiple headers not combined properly"
-
--- 57,58 ----

Index: test_multifile.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_multifile.py,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** test_multifile.py 22 Sep 2002 09:03:03 -0000 1.1.2.1
--- test_multifile.py 7 Oct 2002 01:18:17 -0000 1.1.2.2
***************
*** 5,14 ****
msg = """Mime-Version: 1.0
Content-Type: multipart/mixed;
! boundary="=====================_590453667==_"
X-OriginalArrivalTime: 05 Feb 2002 03:43:23.0310 (UTC) FILETIME=[42D88CE0:01C1ADF7]

--=====================_590453667==_
Content-Type: multipart/alternative;
! boundary="=====================_590453677==_.ALT"

--=====================_590453677==_.ALT
--- 5,14 ----
msg = """Mime-Version: 1.0
Content-Type: multipart/mixed;
! boundary="=====================_590453667==_"
X-OriginalArrivalTime: 05 Feb 2002 03:43:23.0310 (UTC) FILETIME=[42D88CE0:01C1ADF7]

--=====================_590453667==_
Content-Type: multipart/alternative;
! boundary="=====================_590453677==_.ALT"

--=====================_590453677==_.ALT
***************
*** 50,55 ****

mf.push(boundary)
! while mf.next():
! getMIMEMsg(mf)
mf.pop()
else:
--- 50,55 ----

mf.push(boundary)
! while mf.next():
! getMIMEMsg(mf)
mf.pop()
else:

Index: test_netrc.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_netrc.py,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** test_netrc.py 25 Mar 2002 13:23:53 -0000 1.1.2.1
--- test_netrc.py 7 Oct 2002 01:18:17 -0000 1.1.2.2
***************
*** 13,17 ****
line4

! default login log2 password pass2

"""
--- 13,17 ----
line4

! default login log2 password pass2

"""
***************
*** 26,30 ****
fp.close()
self.netrc = netrc.netrc(temp_filename)
!
def tearDown (self):
del self.netrc
--- 26,30 ----
fp.close()
self.netrc = netrc.netrc(temp_filename)
!
def tearDown (self):
del self.netrc
***************
*** 37,43 ****
self.assert_(self.netrc.hosts['foo'] == ('log1', 'acct1', 'pass1'))
self.assert_(self.netrc.hosts['default'] == ('log2', None, 'pass2'))
!
!
if __name__ == "__main__":
test_support.run_unittest(NetrcTestCase)
-
--- 37,42 ----
self.assert_(self.netrc.hosts['foo'] == ('log1', 'acct1', 'pass1'))
self.assert_(self.netrc.hosts['default'] == ('log2', None, 'pass2'))
!
!
if __name__ == "__main__":
test_support.run_unittest(NetrcTestCase)

Index: test_string.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_string.py,v
retrieving revision 1.15.6.1
retrieving revision 1.15.6.2
diff -C2 -d -r1.15.6.1 -r1.15.6.2
*** test_string.py 22 Apr 2002 11:57:05 -0000 1.15.6.1
--- test_string.py 7 Oct 2002 01:18:17 -0000 1.15.6.2
***************
*** 39,43 ****
if value is input:
if verbose:
! print 'no'
print '*',f, `input`, `output`, `value`
return
--- 39,43 ----
if value is input:
if verbose:
! print 'no'
print '*',f, `input`, `output`, `value`
return

Index: test_trace.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_trace.py,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -d -r1.4.2.1 -r1.4.2.2
*** test_trace.py 2 Oct 2002 13:13:46 -0000 1.4.2.1
--- test_trace.py 7 Oct 2002 01:18:17 -0000 1.4.2.2
***************
*** 120,124 ****
def settrace_and_return(tracefunc):
_settrace_and_return(tracefunc)
!
settrace_and_return.events = [(1, 'return')]

--- 120,124 ----
def settrace_and_return(tracefunc):
_settrace_and_return(tracefunc)
!
settrace_and_return.events = [(1, 'return')]

***************
*** 132,136 ****
except RuntimeError, exc:
pass
!
settrace_and_raise.events = [.(2, 'exception'),
(3, 'line'),
--- 132,136 ----
except RuntimeError, exc:
pass
!
settrace_and_raise.events = [.(2, 'exception'),
(3, 'line'),
***************
*** 147,151 ****
class TraceTestCase(unittest.TestCase):
def compare_events(self, line_offset, events, expected_events):
! events = [(l - line_offset, e) for (l, e) in events]
if events != expected_events:
self.fail(
--- 147,151 ----
class TraceTestCase(unittest.TestCase):
def compare_events(self, line_offset, events, expected_events):
! events = [(l - line_offset, e) for (l, e) in events]
if events != expected_events:
self.fail(
***************
*** 153,158 ****
"\n".join(difflib.ndiff(map(str, expected_events),
map(str, events))))
!
!
def run_test(self, func):
tracer = Tracer()
--- 153,158 ----
"\n".join(difflib.ndiff(map(str, expected_events),
map(str, events))))
!
!
def run_test(self, func):
tracer = Tracer()
***************
*** 169,173 ****
self.compare_events(func.func_code.co_firstlineno,
tracer.events, func.events)
!
def test_1_basic(self):
self.run_test(basic)
--- 169,173 ----
self.compare_events(func.func_code.co_firstlineno,
tracer.events, func.events)
!
def test_1_basic(self):
self.run_test(basic)
***************
*** 207,211 ****
except RuntimeError:
self.fail("recursion counter not reset")
!

def test_main():
--- 207,211 ----
except RuntimeError:
self.fail("recursion counter not reset")
!

def test_main():

Index: test_urlparse.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_urlparse.py,v
retrieving revision 1.2.24.2
retrieving revision 1.2.24.3
diff -C2 -d -r1.2.24.2 -r1.2.24.3
*** test_urlparse.py 25 Sep 2002 19:22:10 -0000 1.2.24.2
--- test_urlparse.py 7 Oct 2002 01:18:17 -0000 1.2.24.3
***************
*** 13,18 ****
(RFC1808_BASE,
('http', 'a', '/b/c/d', 'p', 'q', 'f')),
! ('file:///tmp/junk.txt',
! ('file', '', '/tmp/junk.txt', '', '', '')),
]:
result = urlparse.urlparse(url)
--- 13,18 ----
(RFC1808_BASE,
('http', 'a', '/b/c/d', 'p', 'q', 'f')),
! ('file:///tmp/junk.txt',
! ('file', '', '/tmp/junk.txt', '', '', '')),
]:
result = urlparse.urlparse(url)