Merge pull request #17 from zopefoundation/fix_compare_for_py35-2

Ensure that we don't overlook errors in first PyObject_RichCompareBool call

.travis.yml

@@ -6,6 +6,7 @@ python:
     - 3.2
     - 3.3
     - 3.4
+    - 3.5
     - pypy
     - pypy3
 install:

BTrees/_compat.h

@@ -27,11 +27,15 @@
 #define TEXT_FROM_STRING PyUnicode_FromString
 #define TEXT_FORMAT PyUnicode_Format
 
+/* Note that the second comparison is skipped if the first comparison returns:
+
+   1  -> There was no error and the answer is -1
+  -1 -> There was an error, which the caller will detect with PyError_Occurred.
+ */
 #define COMPARE(lhs, rhs) \
-    PyObject_RichCompareBool((lhs), (rhs), Py_LT) > 0 ? -1 : \
+  PyObject_RichCompareBool((lhs), (rhs), Py_LT) != 0 ? -1 : \
     (PyObject_RichCompareBool((lhs), (rhs), Py_EQ) > 0 ? 0 : 1)
 
-
 #else
 
 #define INTERN PyString_InternFromString

CHANGES.rst

 ``BTrees`` Changelog
 ====================
 
-4.1.5 (unreleased)
+4.2.0 (unreleased)
 ------------------
 
-- TBD
+- Python 3.5 support.
 
 4.1.4 (2015-06-02)
 ------------------

setup.py

@@ -128,6 +128,7 @@ setup(name='BTrees',
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Framework :: ZODB",

tox.ini

@@ -3,7 +3,7 @@ envlist =
 # Jython support pending 2.7 support, due 2012-07-15 or so.  See:
 # http://fwierzbicki.blogspot.com/2012/03/adconion-to-fund-jython-27.html
 #   py26,py27,py32,jython,pypy,coverage,docs
-    py26,py27,py27-pure,pypy,py32,py33,py34,pypy3,w_zodb,coverage,docs
+    py26,py27,py27-pure,pypy,py32,py33,py34,py35,pypy3,w_zodb,coverage,docs
 
 [testenv]
 deps =