[Jython-checkins] SF.net SVN: jython: [4878] branches/asm/Lib

[<pj...@us...>]

Revision: 4878
          http://jython.svn.sourceforge.net/jython/?rev=4878&view=rev
Author:   pjenvey
Date:     2008-07-08 14:05:48 -0700 (Tue, 08 Jul 2008)

Log Message:
-----------
o allow a length argument to zlib decompressobj flush
o workarounds for 2.5 test_scope test_types (which output now matches stdlib's)
and test_zlib

Modified Paths:
--------------
    branches/asm/Lib/test/test_scope.py
    branches/asm/Lib/test/test_types.py
    branches/asm/Lib/test/test_zlib.py
    branches/asm/Lib/zlib.py

Removed Paths:
-------------
    branches/asm/Lib/test/output/test_types

Deleted: branches/asm/Lib/test/output/test_types
===================================================================
--- branches/asm/Lib/test/output/test_types	2008-07-08 20:38:02 UTC (rev 4877)
+++ branches/asm/Lib/test/output/test_types	2008-07-08 21:05:48 UTC (rev 4878)
@@ -1,15 +0,0 @@
-test_types
-6. Built-in types
-6.1 Truth value testing
-6.2 Boolean operations
-6.3 Comparisons
-6.4 Numeric types (mostly conversions)
-6.4.1 32-bit integers
-6.4.2 Long integers
-6.4.3 Floating point numbers
-6.5 Sequence types
-6.5.1 Strings
-6.5.2 Tuples
-6.5.3 Lists
-6.5.3a Additional list operations
-6.6 Mappings == Dictionaries

Modified: branches/asm/Lib/test/test_scope.py
===================================================================
--- branches/asm/Lib/test/test_scope.py	2008-07-08 20:38:02 UTC (rev 4877)
+++ branches/asm/Lib/test/test_scope.py	2008-07-08 21:05:48 UTC (rev 4878)
@@ -1,4 +1,4 @@
-from test.test_support import verify, TestFailed, check_syntax, vereq
+from test.test_support import verify, TestFailed, check_syntax, vereq, is_jython
 
 import warnings
 warnings.filterwarnings("ignore", r"import \*", SyntaxWarning, "<string>")
@@ -435,6 +435,9 @@
 for i in range(100):
     f1()
 
+if is_jython:
+    from test_weakref import extra_collect
+    extra_collect()
 vereq(Foo.count, 0)
 
 print "17. class and global"

Modified: branches/asm/Lib/test/test_types.py
===================================================================
--- branches/asm/Lib/test/test_types.py	2008-07-08 20:38:02 UTC (rev 4877)
+++ branches/asm/Lib/test/test_types.py	2008-07-08 21:05:48 UTC (rev 4878)
@@ -229,58 +229,60 @@
 except TypeError: pass
 else: raise TestFailed, 'type(), w/4 args expected TypeError'
 
+# XXX: Jython lacks buffers
 print 'Buffers'
-try: buffer('asdf', -1)
-except ValueError: pass
-else: raise TestFailed, "buffer('asdf', -1) should raise ValueError"
-cmp(buffer("abc"), buffer("def")) # used to raise a warning: tp_compare didn't return -1, 0, or 1
+if not is_jython:
+    try: buffer('asdf', -1)
+    except ValueError: pass
+    else: raise TestFailed, "buffer('asdf', -1) should raise ValueError"
+    cmp(buffer("abc"), buffer("def")) # used to raise a warning: tp_compare didn't return -1, 0, or 1
 
-try: buffer(None)
-except TypeError: pass
-else: raise TestFailed, "buffer(None) should raise TypeError"
+    try: buffer(None)
+    except TypeError: pass
+    else: raise TestFailed, "buffer(None) should raise TypeError"
 
-a = buffer('asdf')
-hash(a)
-b = a * 5
-if a == b:
-    raise TestFailed, 'buffers should not be equal'
-if str(b) != ('asdf' * 5):
-    raise TestFailed, 'repeated buffer has wrong content'
-if str(a * 0) != '':
-    raise TestFailed, 'repeated buffer zero times has wrong content'
-if str(a + buffer('def')) != 'asdfdef':
-    raise TestFailed, 'concatenation of buffers yields wrong content'
-if str(buffer(a)) != 'asdf':
-    raise TestFailed, 'composing buffers failed'
-if str(buffer(a, 2)) != 'df':
-    raise TestFailed, 'specifying buffer offset failed'
-if str(buffer(a, 0, 2)) != 'as':
-    raise TestFailed, 'specifying buffer size failed'
-if str(buffer(a, 1, 2)) != 'sd':
-    raise TestFailed, 'specifying buffer offset and size failed'
-try: buffer(buffer('asdf', 1), -1)
-except ValueError: pass
-else: raise TestFailed, "buffer(buffer('asdf', 1), -1) should raise ValueError"
-if str(buffer(buffer('asdf', 0, 2), 0)) != 'as':
-    raise TestFailed, 'composing length-specified buffer failed'
-if str(buffer(buffer('asdf', 0, 2), 0, 5000)) != 'as':
-    raise TestFailed, 'composing length-specified buffer failed'
-if str(buffer(buffer('asdf', 0, 2), 0, -1)) != 'as':
-    raise TestFailed, 'composing length-specified buffer failed'
-if str(buffer(buffer('asdf', 0, 2), 1, 2)) != 's':
-    raise TestFailed, 'composing length-specified buffer failed'
+    a = buffer('asdf')
+    hash(a)
+    b = a * 5
+    if a == b:
+        raise TestFailed, 'buffers should not be equal'
+    if str(b) != ('asdf' * 5):
+        raise TestFailed, 'repeated buffer has wrong content'
+    if str(a * 0) != '':
+        raise TestFailed, 'repeated buffer zero times has wrong content'
+    if str(a + buffer('def')) != 'asdfdef':
+        raise TestFailed, 'concatenation of buffers yields wrong content'
+    if str(buffer(a)) != 'asdf':
+        raise TestFailed, 'composing buffers failed'
+    if str(buffer(a, 2)) != 'df':
+        raise TestFailed, 'specifying buffer offset failed'
+    if str(buffer(a, 0, 2)) != 'as':
+        raise TestFailed, 'specifying buffer size failed'
+    if str(buffer(a, 1, 2)) != 'sd':
+        raise TestFailed, 'specifying buffer offset and size failed'
+    try: buffer(buffer('asdf', 1), -1)
+    except ValueError: pass
+    else: raise TestFailed, "buffer(buffer('asdf', 1), -1) should raise ValueError"
+    if str(buffer(buffer('asdf', 0, 2), 0)) != 'as':
+        raise TestFailed, 'composing length-specified buffer failed'
+    if str(buffer(buffer('asdf', 0, 2), 0, 5000)) != 'as':
+        raise TestFailed, 'composing length-specified buffer failed'
+    if str(buffer(buffer('asdf', 0, 2), 0, -1)) != 'as':
+        raise TestFailed, 'composing length-specified buffer failed'
+    if str(buffer(buffer('asdf', 0, 2), 1, 2)) != 's':
+        raise TestFailed, 'composing length-specified buffer failed'
 
-try: a[1] = 'g'
-except TypeError: pass
-else: raise TestFailed, "buffer assignment should raise TypeError"
+    try: a[1] = 'g'
+    except TypeError: pass
+    else: raise TestFailed, "buffer assignment should raise TypeError"
 
-try: a[0:1] = 'g'
-except TypeError: pass
-else: raise TestFailed, "buffer slice assignment should raise TypeError"
+    try: a[0:1] = 'g'
+    except TypeError: pass
+    else: raise TestFailed, "buffer slice assignment should raise TypeError"
 
-# array.array() returns an object that does not implement a char buffer,
-# something which int() uses for conversion.
-import array
-try: int(buffer(array.array('c')))
-except TypeError :pass
-else: raise TestFailed, "char buffer (at C level) not working"
+    # array.array() returns an object that does not implement a char buffer,
+    # something which int() uses for conversion.
+    import array
+    try: int(buffer(array.array('c')))
+    except TypeError :pass
+    else: raise TestFailed, "char buffer (at C level) not working"

Modified: branches/asm/Lib/test/test_zlib.py
===================================================================
--- branches/asm/Lib/test/test_zlib.py	2008-07-08 20:38:02 UTC (rev 4877)
+++ branches/asm/Lib/test/test_zlib.py	2008-07-08 21:05:48 UTC (rev 4878)
@@ -33,12 +33,16 @@
 
     def test_adler32start(self):
         self.assertEqual(zlib.adler32(""), zlib.adler32("", 1))
-        self.assert_(zlib.adler32("abc", 0xffffffff))
+        # XXX: Jython adler32 only supports start value of 1
+        if not test_support.is_jython:
+            self.assert_(zlib.adler32("abc", 0xffffffff))
 
     def test_adler32empty(self):
-        self.assertEqual(zlib.adler32("", 0), 0)
+        if not test_support.is_jython:
+            self.assertEqual(zlib.adler32("", 0), 0)
         self.assertEqual(zlib.adler32("", 1), 1)
-        self.assertEqual(zlib.adler32("", 432), 432)
+        if not test_support.is_jython:
+            self.assertEqual(zlib.adler32("", 432), 432)
 
     def assertEqual32(self, seen, expected):
         # 32-bit values masked -- checksums on 32- vs 64- bit machines
@@ -48,7 +52,8 @@
     def test_penguins(self):
         self.assertEqual32(zlib.crc32("penguin", 0), 0x0e5c1a120L)
         self.assertEqual32(zlib.crc32("penguin", 1), 0x43b6aa94)
-        self.assertEqual32(zlib.adler32("penguin", 0), 0x0bcf02f6)
+        if not test_support.is_jython:
+            self.assertEqual32(zlib.adler32("penguin", 0), 0x0bcf02f6)
         self.assertEqual32(zlib.adler32("penguin", 1), 0x0bd602f7)
 
         self.assertEqual(zlib.crc32("penguin"), zlib.crc32("penguin", 0))

Modified: branches/asm/Lib/zlib.py
===================================================================
--- branches/asm/Lib/zlib.py	2008-07-08 20:38:02 UTC (rev 4877)
+++ branches/asm/Lib/zlib.py	2008-07-08 21:05:48 UTC (rev 4878)
@@ -118,10 +118,14 @@
         
         return inflated
 
-    def flush(self):
+    def flush(self, length=None):
         if self._ended:
             raise error("decompressobj may not be used after flush()")
-        last = _get_inflate_data(self.inflater)
+        if length is None:
+            length = 0
+        elif length <= 0:
+            raise ValueError('length must be greater than zero')
+        last = _get_inflate_data(self.inflater, length)
         self.inflater.end()
         return last
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.