Kaydet (Commit) abd8a336 authored tarafından Tim Peters's avatar Tim Peters

Whitespace normalization.

üst be1bc3b6
...@@ -729,7 +729,7 @@ class SMTP_SSL(SMTP): ...@@ -729,7 +729,7 @@ class SMTP_SSL(SMTP):
support). If host is not specified, '' (the local host) is used. If port is support). If host is not specified, '' (the local host) is used. If port is
omitted, the standard SMTP-over-SSL port (465) is used. keyfile and certfile omitted, the standard SMTP-over-SSL port (465) is used. keyfile and certfile
are also optional - they can contain a PEM formatted private key and are also optional - they can contain a PEM formatted private key and
certificate chain file for the SSL connection. certificate chain file for the SSL connection.
""" """
def __init__(self, host = '', port = 0, local_hostname = None, def __init__(self, host = '', port = 0, local_hostname = None,
keyfile = None, certfile = None): keyfile = None, certfile = None):
......
...@@ -192,7 +192,7 @@ __kp__.__setup__(500) ...@@ -192,7 +192,7 @@ __kp__.__setup__(500)
''' '''
class MimewriterTest(unittest.TestCase): class MimewriterTest(unittest.TestCase):
def test(self): def test(self):
buf = StringIO.StringIO() buf = StringIO.StringIO()
......
...@@ -50,7 +50,7 @@ class FutureTest(unittest.TestCase): ...@@ -50,7 +50,7 @@ class FutureTest(unittest.TestCase):
check(mandatory, "mandatory") check(mandatory, "mandatory")
a(optional < mandatory, a(optional < mandatory,
"optional not less than mandatory, and mandatory not None") "optional not less than mandatory, and mandatory not None")
a(hasattr(value, "compiler_flag"), a(hasattr(value, "compiler_flag"),
"feature is missing a .compiler_flag attr") "feature is missing a .compiler_flag attr")
a(isinstance(getattr(value, "compiler_flag"), int), a(isinstance(getattr(value, "compiler_flag"), int),
......
...@@ -36,7 +36,7 @@ class BufferSizeTest(unittest.TestCase): ...@@ -36,7 +36,7 @@ class BufferSizeTest(unittest.TestCase):
os.unlink(test_support.TESTFN) os.unlink(test_support.TESTFN)
except: except:
pass pass
def drive_one(self, pattern): def drive_one(self, pattern):
for length in lengths: for length in lengths:
# Repeat string 'pattern' as often as needed to reach total length # Repeat string 'pattern' as often as needed to reach total length
......
...@@ -911,7 +911,7 @@ class StreamReaderTest(unittest.TestCase): ...@@ -911,7 +911,7 @@ class StreamReaderTest(unittest.TestCase):
self.assertEquals(f.readlines(), [u'\ud55c\n', u'\uae00']) self.assertEquals(f.readlines(), [u'\ud55c\n', u'\uae00'])
class EncodedFileTest(unittest.TestCase): class EncodedFileTest(unittest.TestCase):
def test_basic(self): def test_basic(self):
f = StringIO.StringIO('\xed\x95\x9c\n\xea\xb8\x80') f = StringIO.StringIO('\xed\x95\x9c\n\xea\xb8\x80')
ef = codecs.EncodedFile(f, 'utf-16-le', 'utf-8') ef = codecs.EncodedFile(f, 'utf-16-le', 'utf-8')
...@@ -1172,7 +1172,7 @@ class BasicUnicodeTest(unittest.TestCase): ...@@ -1172,7 +1172,7 @@ class BasicUnicodeTest(unittest.TestCase):
decoder = codecs.getincrementaldecoder(encoding)("ignore") decoder = codecs.getincrementaldecoder(encoding)("ignore")
decodedresult = u"".join(decoder.decode(c) for c in encodedresult) decodedresult = u"".join(decoder.decode(c) for c in encodedresult)
self.assertEqual(decodedresult, s, "%r != %r (encoding=%r)" % (decodedresult, s, encoding)) self.assertEqual(decodedresult, s, "%r != %r (encoding=%r)" % (decodedresult, s, encoding))
encodedresult = "".join(cencoder.encode(c) for c in s) encodedresult = "".join(cencoder.encode(c) for c in s)
cdecoder = _testcapi.codec_incrementaldecoder(encoding, "ignore") cdecoder = _testcapi.codec_incrementaldecoder(encoding, "ignore")
decodedresult = u"".join(cdecoder.decode(c) for c in encodedresult) decodedresult = u"".join(cdecoder.decode(c) for c in encodedresult)
......
...@@ -123,10 +123,10 @@ class GrammarTests(unittest.TestCase): ...@@ -123,10 +123,10 @@ class GrammarTests(unittest.TestCase):
# single_input: NEWLINE | simple_stmt | compound_stmt NEWLINE # single_input: NEWLINE | simple_stmt | compound_stmt NEWLINE
# XXX can't test in a script -- this rule is only used when interactive # XXX can't test in a script -- this rule is only used when interactive
# file_input: (NEWLINE | stmt)* ENDMARKER # file_input: (NEWLINE | stmt)* ENDMARKER
# Being tested as this very moment this very module # Being tested as this very moment this very module
# expr_input: testlist NEWLINE # expr_input: testlist NEWLINE
# XXX Hard to test -- used only in calls to input() # XXX Hard to test -- used only in calls to input()
...@@ -329,7 +329,7 @@ class GrammarTests(unittest.TestCase): ...@@ -329,7 +329,7 @@ class GrammarTests(unittest.TestCase):
# which is not available in unittest. # which is not available in unittest.
save_stdout = sys.stdout save_stdout = sys.stdout
sys.stdout = StringIO.StringIO() sys.stdout = StringIO.StringIO()
print 1, 2, 3 print 1, 2, 3
print 1, 2, 3, print 1, 2, 3,
print print
...@@ -563,7 +563,7 @@ hello world ...@@ -563,7 +563,7 @@ hello world
elif 0: pass elif 0: pass
elif 0: pass elif 0: pass
else: pass else: pass
def testWhile(self): def testWhile(self):
# 'while' test ':' suite ['else' ':' suite] # 'while' test ':' suite ['else' ':' suite]
while 0: pass while 0: pass
...@@ -696,7 +696,7 @@ hello world ...@@ -696,7 +696,7 @@ hello world
def testSelectors(self): def testSelectors(self):
### trailer: '(' [testlist] ')' | '[' subscript ']' | '.' NAME ### trailer: '(' [testlist] ')' | '[' subscript ']' | '.' NAME
### subscript: expr | [expr] ':' [expr] ### subscript: expr | [expr] ':' [expr]
import sys, time import sys, time
c = sys.path[0] c = sys.path[0]
x = time.time() x = time.time()
......
...@@ -754,15 +754,15 @@ class _TestMboxMMDF(TestMailbox): ...@@ -754,15 +754,15 @@ class _TestMboxMMDF(TestMailbox):
key1 = self._box.add(msg) key1 = self._box.add(msg)
self._box.flush() self._box.flush()
self._box.close() self._box.close()
self._box = self._factory(self._path) self._box = self._factory(self._path)
self._box.lock() self._box.lock()
key2 = self._box.add(msg) key2 = self._box.add(msg)
self._box.flush() self._box.flush()
self.assert_(self._box._locked) self.assert_(self._box._locked)
self._box.close() self._box.close()
class TestMbox(_TestMboxMMDF): class TestMbox(_TestMboxMMDF):
......
...@@ -152,7 +152,7 @@ class MathTests(unittest.TestCase): ...@@ -152,7 +152,7 @@ class MathTests(unittest.TestCase):
testmodf('modf(1.5)', math.modf(1.5), (0.5, 1.0)) testmodf('modf(1.5)', math.modf(1.5), (0.5, 1.0))
testmodf('modf(-1.5)', math.modf(-1.5), (-0.5, -1.0)) testmodf('modf(-1.5)', math.modf(-1.5), (-0.5, -1.0))
def testPow(self): def testPow(self):
self.assertRaises(TypeError, math.pow) self.assertRaises(TypeError, math.pow)
self.ftest('pow(0,1)', math.pow(0,1), 0) self.ftest('pow(0,1)', math.pow(0,1), 0)
......
...@@ -218,7 +218,7 @@ class MmapTests(unittest.TestCase): ...@@ -218,7 +218,7 @@ class MmapTests(unittest.TestCase):
# Ensuring copy-on-write maps cannot be resized # Ensuring copy-on-write maps cannot be resized
self.assertRaises(TypeError, m.resize, 2*mapsize) self.assertRaises(TypeError, m.resize, 2*mapsize)
del m, f del m, f
# Ensuring invalid access parameter raises exception # Ensuring invalid access parameter raises exception
f = open(TESTFN, "r+b") f = open(TESTFN, "r+b")
self.assertRaises(ValueError, mmap.mmap, f.fileno(), mapsize, access=4) self.assertRaises(ValueError, mmap.mmap, f.fileno(), mapsize, access=4)
......
...@@ -21,7 +21,7 @@ class PollTests(unittest.TestCase): ...@@ -21,7 +21,7 @@ class PollTests(unittest.TestCase):
def test_poll1(self): def test_poll1(self):
# Basic functional test of poll object # Basic functional test of poll object
# Create a bunch of pipe and test that poll works with them. # Create a bunch of pipe and test that poll works with them.
p = select.poll() p = select.poll()
NUM_PIPES = 12 NUM_PIPES = 12
......
...@@ -8,7 +8,7 @@ warnings.filterwarnings("ignore", r"import \*", SyntaxWarning, "<string>") ...@@ -8,7 +8,7 @@ warnings.filterwarnings("ignore", r"import \*", SyntaxWarning, "<string>")
class ScopeTests(unittest.TestCase): class ScopeTests(unittest.TestCase):
def testSimpleNesting(self): def testSimpleNesting(self):
def make_adder(x): def make_adder(x):
def adder(y): def adder(y):
return x + y return x + y
......
...@@ -43,11 +43,11 @@ class TestWarnings(test.test_warnings.TestModule): ...@@ -43,11 +43,11 @@ class TestWarnings(test.test_warnings.TestModule):
def has_warned(self): def has_warned(self):
self.assertEqual(test.test_warnings.msg.category, self.assertEqual(test.test_warnings.msg.category,
exceptions.RuntimeWarning.__name__) exceptions.RuntimeWarning.__name__)
def test_byte_max(self): def test_byte_max(self):
ts.T_BYTE=CHAR_MAX+1 ts.T_BYTE=CHAR_MAX+1
self.has_warned() self.has_warned()
def test_byte_min(self): def test_byte_min(self):
ts.T_BYTE=CHAR_MIN-1 ts.T_BYTE=CHAR_MIN-1
self.has_warned() self.has_warned()
...@@ -68,7 +68,7 @@ class TestWarnings(test.test_warnings.TestModule): ...@@ -68,7 +68,7 @@ class TestWarnings(test.test_warnings.TestModule):
ts.T_USHORT=USHRT_MAX+1 ts.T_USHORT=USHRT_MAX+1
self.has_warned() self.has_warned()
def test_main(verbose=None): def test_main(verbose=None):
test_support.run_unittest( test_support.run_unittest(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment