Menu
▾
▴
[Jython-checkins] SF.net SVN: jython:[6655] trunk/jython/Lib/test
|
From: <fwi...@us...> - 2009-08-10 18:57:04
|
Revision: 6655
http://jython.svn.sourceforge.net/jython/?rev=6655&view=rev
Author: fwierzbicki
Date: 2009-08-10 18:56:57 +0000 (Mon, 10 Aug 2009)
Log Message:
-----------
Reindent.
Modified Paths:
--------------
trunk/jython/Lib/test/test__rawffi.py
trunk/jython/Lib/test/test_array_jy.py
trunk/jython/Lib/test/test_coerce_jy.py
trunk/jython/Lib/test/test_func_syntax_jy.py
trunk/jython/Lib/test/test_grammar_jy.py
trunk/jython/Lib/test/test_java_visibility.py
trunk/jython/Lib/test/test_sort_jy.py
trunk/jython/Lib/test/test_str2unicode.py
trunk/jython/Lib/test/test_stringmap.py
trunk/jython/Lib/test/test_with.py
Modified: trunk/jython/Lib/test/test__rawffi.py
===================================================================
--- trunk/jython/Lib/test/test__rawffi.py 2009-08-10 18:30:18 UTC (rev 6654)
+++ trunk/jython/Lib/test/test__rawffi.py 2009-08-10 18:56:57 UTC (rev 6655)
@@ -3,7 +3,7 @@
# xxx - forces a skip in the case we haven't built ctypes_test module in ant (which is not yet a task as of now)
-try:
+try:
import _rawffi
_rawffi.CDLL("ctypes_test")
except:
Modified: trunk/jython/Lib/test/test_array_jy.py
===================================================================
--- trunk/jython/Lib/test/test_array_jy.py 2009-08-10 18:30:18 UTC (rev 6654)
+++ trunk/jython/Lib/test/test_array_jy.py 2009-08-10 18:56:57 UTC (rev 6655)
@@ -24,7 +24,7 @@
jStringArr = array(String, [String("a"), String("b"), String("c")])
self.assert_(
Arrays.equals(jStringArr.typecode, 'java.lang.String'),
- "String array typecode of wrong type, expected %s, found %s" %
+ "String array typecode of wrong type, expected %s, found %s" %
(jStringArr.typecode, str(String)))
self.assertEqual(zeros(String, 5), Array.newInstance(String, 5))
Modified: trunk/jython/Lib/test/test_coerce_jy.py
===================================================================
--- trunk/jython/Lib/test/test_coerce_jy.py 2009-08-10 18:30:18 UTC (rev 6654)
+++ trunk/jython/Lib/test/test_coerce_jy.py 2009-08-10 18:56:57 UTC (rev 6655)
@@ -25,4 +25,3 @@
if __name__ == "__main__":
test_main()
-
Modified: trunk/jython/Lib/test/test_func_syntax_jy.py
===================================================================
--- trunk/jython/Lib/test/test_func_syntax_jy.py 2009-08-10 18:30:18 UTC (rev 6654)
+++ trunk/jython/Lib/test/test_func_syntax_jy.py 2009-08-10 18:56:57 UTC (rev 6655)
@@ -4,17 +4,17 @@
def parrot(**args): pass
class FuncSyntaxTest(unittest.TestCase):
-
- def test_keywords_before_normal(self):
- self.assertRaises(SyntaxError, eval,
- "parrot(voltage=.5, \'dead\')")
- def test_dup_keywords(self):
- self.assertRaises(TypeError, eval,
- "complex(imag=4, imag=2)")
+ def test_keywords_before_normal(self):
+ self.assertRaises(SyntaxError, eval,
+ "parrot(voltage=.5, \'dead\')")
+ def test_dup_keywords(self):
+ self.assertRaises(TypeError, eval,
+ "complex(imag=4, imag=2)")
+
def test_main():
- test.test_support.run_unittest(FuncSyntaxTest)
+ test.test_support.run_unittest(FuncSyntaxTest)
if __name__ == "__main__":
- test_main()
+ test_main()
Modified: trunk/jython/Lib/test/test_grammar_jy.py
===================================================================
--- trunk/jython/Lib/test/test_grammar_jy.py 2009-08-10 18:30:18 UTC (rev 6654)
+++ trunk/jython/Lib/test/test_grammar_jy.py 2009-08-10 18:56:57 UTC (rev 6655)
@@ -6,12 +6,12 @@
class GrammarTest(unittest.TestCase):
def test_triple_quote_len(self):
- s1 = r"""
+ s1 = r"""
\""" 1.triple-quote
\""" 2.triple-quote
"""
- s2 = r'''
+ s2 = r'''
\""" 1.triple-quote
\""" 2.triple-quote
'''
Modified: trunk/jython/Lib/test/test_java_visibility.py
===================================================================
--- trunk/jython/Lib/test/test_java_visibility.py 2009-08-10 18:30:18 UTC (rev 6654)
+++ trunk/jython/Lib/test/test_java_visibility.py 2009-08-10 18:56:57 UTC (rev 6655)
@@ -4,7 +4,7 @@
import sys
from test import test_support
from java.lang import Byte, Class, Integer
-from java.util import ArrayList, Collections, HashMap, LinkedList, Observable, Observer
+from java.util import ArrayList, Collections, HashMap, LinkedList, Observable, Observer
from org.python.tests import (Coercions, HiddenSuper, InterfaceCombination, Invisible, Matryoshka,
OnlySubclassable, OtherSubVisible, SomePyMethods, SubVisible, Visible, VisibleOverride)
from org.python.tests import VisibilityResults as Results
@@ -81,7 +81,7 @@
self.assertEquals(Results.OVERLOADED_EXTRA_ARG_PUBLIC_METHOD,
v.visibleInstance('a', 'b'))
self.assertEquals(Results.PUBLIC_STATIC_METHOD, Visible.visibleStatic(0))
- self.assertEquals(Results.OVERLOADED_PUBLIC_STATIC_METHOD,
+ self.assertEquals(Results.OVERLOADED_PUBLIC_STATIC_METHOD,
v.visibleStatic('a'))
self.assertEquals(Results.EXTRA_ARG_PUBLIC_STATIC_METHOD,
v.visibleStatic(0, 'a'))
@@ -103,11 +103,11 @@
self.assertEquals(Results.SUBCLASS_OVERRIDE, s.visibleInstance(3))
self.assertEquals(Results.SUBCLASS_OVERLOAD, s.visibleInstance(3.0, 'a'))
self.assertEquals(Results.PACKAGE_METHOD, s.packageMethod())
- # Java methods don't allow direct calling of the superclass method, so it should
+ # Java methods don't allow direct calling of the superclass method, so it should
# return the subclass value here.
self.assertEquals(Results.SUBCLASS_OVERRIDE, Visible.visibleInstance(s, 3))
self.assertEquals(Results.PUBLIC_STATIC_FIELD, SubVisible.StaticInner.visibleStaticField)
-
+
self.assertEquals(Results.VISIBLE_SHARED_NAME_FIELD, Visible.sharedNameField)
self.assertEquals(Results.SUBVISIBLE_SHARED_NAME_FIELD, SubVisible.sharedNameField)
self.assertEquals(Results.VISIBLE_SHARED_NAME_FIELD * 10, Visible().sharedNameField)
@@ -129,7 +129,7 @@
"methods from IIFace should be visible on Implementation")
self.assertEquals(InterfaceCombination.TWO_ARG_RESULT, i.getValue("one arg", "two arg"),
"methods from Base should be visible on Implementation")
- self.assertRaises(TypeError, i.getValue, "one arg", "two arg", "three arg",
+ self.assertRaises(TypeError, i.getValue, "one arg", "two arg", "three arg",
"methods defined solely on Implementation shouldn't be visible")
self.assertFalse(hasattr(i, "internalMethod"),
"methods from private interfaces shouldn't be visible on a private class")
Modified: trunk/jython/Lib/test/test_sort_jy.py
===================================================================
--- trunk/jython/Lib/test/test_sort_jy.py 2009-08-10 18:30:18 UTC (rev 6654)
+++ trunk/jython/Lib/test/test_sort_jy.py 2009-08-10 18:56:57 UTC (rev 6655)
@@ -20,4 +20,4 @@
test_support.run_unittest(SortTest)
if __name__ == "__main__":
- test_main()
+ test_main()
Modified: trunk/jython/Lib/test/test_str2unicode.py
===================================================================
--- trunk/jython/Lib/test/test_str2unicode.py 2009-08-10 18:30:18 UTC (rev 6654)
+++ trunk/jython/Lib/test/test_str2unicode.py 2009-08-10 18:56:57 UTC (rev 6655)
@@ -19,7 +19,7 @@
self.assertEquals(unicode, type('%r %r' % (u'x', 'y')))
self.assertEquals(unicode, type('%(x)r' % {'x' : u'x'}))
- def test_string_formatting_c(self):
+ def test_string_formatting_c(self):
self.assertEquals(unicode, type('%c' % u'x'))
self.assertEquals(unicode, type('%c %c' % (u'x', 'y')))
self.assertEquals(unicode, type('%(x)c' % {'x' : u'x'}))
@@ -42,7 +42,7 @@
self.assertEquals(str, type('%r' % 'x'))
self.assertEquals(str, type('%r %r' % ('x', 'y')))
self.assertEquals(str, type('%(x)r' % {'x' : 'x'}))
-
+
def test_string_formatting_c(self):
self.assertEquals(str, type('%c' % 'x'))
self.assertEquals(str, type('%c %c' % ('x', 'y')))
Modified: trunk/jython/Lib/test/test_stringmap.py
===================================================================
--- trunk/jython/Lib/test/test_stringmap.py 2009-08-10 18:30:18 UTC (rev 6654)
+++ trunk/jython/Lib/test/test_stringmap.py 2009-08-10 18:56:57 UTC (rev 6655)
@@ -12,7 +12,7 @@
class ClassDictTests(StringMapTest):
"""Check that class dicts conform to the mapping protocol"""
-
+
def _empty_mapping(self):
for key in SimpleClass.__dict__.copy():
SimpleClass.__dict__.pop(key)
Modified: trunk/jython/Lib/test/test_with.py
===================================================================
--- trunk/jython/Lib/test/test_with.py 2009-08-10 18:30:18 UTC (rev 6654)
+++ trunk/jython/Lib/test/test_with.py 2009-08-10 18:56:57 UTC (rev 6655)
@@ -704,14 +704,14 @@
NonLocalFlowControlTestCase,
AssignmentTargetTestCase,
ExitSwallowsExceptionTestCase,
- )
+ )
#XXX: punting NewKeywordsWarningTestCase at least for the
# short term making "with" and "as" anything but true
# keywords is not easy with the antlr parser though it is
# probably doable. Just not a high priority compared to
# other problems and in 2.6+ it is a non-problem since
# these become true keywords in CPython.
- #
+ #
#NewKeywordsWarningTestCase)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
