From 72f436797b97c931038268766266ee1514678d80 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=B6rg=20Lehmann?= <joergl@users.sourceforge.net>
Date: Sun, 30 Mar 2003 10:51:35 +0000
Subject: [PATCH] fix comment and cleanup implementation

git-svn-id: https://pyx.svn.sourceforge.net/svnroot/pyx/trunk/pyx@835 069f4177-920e-0410-937b-c2a4a81bcd90
---
 pyx/path.py | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/pyx/path.py b/pyx/path.py
index 449799d7..da200a7a 100755
--- a/pyx/path.py
+++ b/pyx/path.py
@@ -1665,8 +1665,8 @@ class normpath(path):
     def intersect(self, other, epsilon=1e-5):
         """intersect self with other path
 
-        returns a list of tuples consisting of the corresponding parameters
-        of the two bpaths
+        returns a tuple of lists consisting of the parameter values
+        of the intersection points of the corresponding normpath
 
         """
 
@@ -1709,21 +1709,19 @@ class normpath(path):
         for intersection in  _bcurvesIntersect(bpathels_a, 0, len(bpathels_a),
                                                bpathels_b, 0, len(bpathels_b),
                                                epsilon):
-            for subpathend_a in subpathends_a:
-                if abs(intersection[0]-subpathend_a)<epsilon:
-                    break
-            else:
-                for subpathend_b in subpathends_b:
-                    if abs(intersection[1]-subpathend_b)<epsilon:
-                        break
-                else:
-                    intersections[0].append(intersection[0])
-                    intersections[1].append(intersection[1])
+            if not ([subpathend_a
+                     for subpathend_a in subpathends_a
+                     if abs(intersection[0]-subpathend_a)<epsilon] or
+                    [subpathend_b
+                     for subpathend_b in subpathends_b
+                     if abs(intersection[1]-subpathend_b)<epsilon]):
+                intersections[0].append(intersection[0])
+                intersections[1].append(intersection[1])
 
         return intersections
 
-        # XXX: the following code is not used, but probably
-        # we could use it for short lists of bpathels 
+        # XXX: the following code is not used, but probably we could
+        # use it for short lists of bpathels
 
         # alternative implementation (not recursive, probably more efficient
         # for short lists bpathel_a and bpathel_b)
-- 
2.11.4.GIT