Merge branch 'python3' into release-1.2.0

Author: exhuma

cluster/cluster.py

@@ -15,6 +15,8 @@
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
+from __future__ import print_function
+
 
 class Cluster(object):
     """
@@ -107,12 +109,12 @@ def display(self, depth=0):
         """
         Pretty-prints this cluster. Useful for debuging
         """
-        print depth * "    " + "[level %s]" % self.__level
+        print(depth * "    " + "[level %s]" % self.__level)
         for item in self.__items:
             if isinstance(item, Cluster):
                 item.display(depth + 1)
             else:
-                print depth * "    " + "%s" % item
+                print(depth * "    " + "%s" % item)
 
     def topology(self):
         """

cluster/method/hierarchical.py

@@ -227,8 +227,9 @@ def cluster(self, matrix=None, level=None, sequence=None):
                 for cell in row:
                     # if we are not on the diagonal (which is always 0)
                     # and if this cell represents a new minimum...
+                    cell_lt_mdist = cell < mindistance if mindistance else False
                     if ((rowindex != cellindex) and
-                            (cell < mindistance or smallestpair is None)):
+                            (cell_lt_mdist or smallestpair is None)):
                         smallestpair = (rowindex, cellindex)
                         mindistance = cell
                     cellindex += 1

cluster/method/kmeans.py

@@ -163,7 +163,7 @@ def initialise_clusters(self, input_, clustercount):
         """
         # initialise the clusters with empty lists
         self.__clusters = []
-        for _ in xrange(clustercount):
+        for _ in range(clustercount):
             self.__clusters.append([])
 
         # distribute the items into the clusters

cluster/util.py

@@ -15,6 +15,7 @@
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
+from __future__ import print_function
 import logging
 
 
@@ -78,7 +79,7 @@ def minkowski_distance(x, y, p=2):
     """
     from math import pow
     assert len(y) == len(x)
-    assert x >= 1
+    assert len(x) >= 1
     sum = 0
     for i in range(len(x)):
         sum += abs(x[i] - y[i]) ** p
@@ -147,7 +148,7 @@ def printmatrix(data):
     format = " %%%is |" % maxlen
     format = "|" + format * colcount
     for row in data:
-        print format % tuple(row)
+        print(format % tuple(row))
 
 
 def magnitude(a):

test.py

@@ -234,9 +234,9 @@ def testNumpyRandom(self):
         unittest.makeSuite(HClusterSmallListTestCase),
         unittest.makeSuite(HClusterStringTestCase),
         unittest.makeSuite(KCluster2DTestCase),
-        unittest.makeSuite(KClusterSFBugs)),
+        unittest.makeSuite(KClusterSFBugs),
         unittest.makeSuite(KClusterSmallListTestCase),
         unittest.makeSuite(NumpyTests),
-    )
+    ))
 
     unittest.TextTestRunner(verbosity=2).run(suite)