[Jython-checkins] SF.net SVN: jython:[6175] trunk/jython

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

Revision: 6175
          http://jython.svn.sourceforge.net/jython/?rev=6175&view=rev
Author:   pjenvey
Date:     2009-04-06 03:19:30 +0000 (Mon, 06 Apr 2009)

Log Message:
-----------
fix complex.__nonzero__

Modified Paths:
--------------
    trunk/jython/Lib/test/test_complex_jy.py
    trunk/jython/src/org/python/core/PyComplex.java

Modified: trunk/jython/Lib/test/test_complex_jy.py
===================================================================
--- trunk/jython/Lib/test/test_complex_jy.py	2009-04-06 03:12:07 UTC (rev 6174)
+++ trunk/jython/Lib/test/test_complex_jy.py	2009-04-06 03:19:30 UTC (rev 6175)
@@ -18,7 +18,11 @@
         # regression in 2.5 alphas
         self.assertEqual((4+0j) ** Foo(), (16+0j))
 
+    def test___nonzero__(self):
+        self.assertTrue(0.25+0j)
+        self.assertTrue(25j)
 
+
 def test_main():
     test_support.run_unittest(ComplexTest)
 

Modified: trunk/jython/src/org/python/core/PyComplex.java
===================================================================
--- trunk/jython/src/org/python/core/PyComplex.java	2009-04-06 03:12:07 UTC (rev 6174)
+++ trunk/jython/src/org/python/core/PyComplex.java	2009-04-06 03:19:30 UTC (rev 6175)
@@ -164,7 +164,7 @@
 
     @ExposedMethod(doc = BuiltinDocs.complex___nonzero___doc)
     final boolean complex___nonzero__() {
-        return real != 0 && imag != 0;
+        return real != 0 || imag != 0;
     }
 
     /*public Object __tojava__(Class c) {


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