Cleanup while 1: ... and file iteration.

anntzer · anntzer · commit b22d35322bf7 · 2016-12-03T19:24:48.000-08:00
diff --git a/examples/misc/multiprocess.py b/examples/misc/multiprocess.py
@@ -28,7 +28,7 @@ def terminate(self):
     def poll_draw(self):
 
         def call_back():
-            while 1:
+            while True:
                 if not self.pipe.poll():
                     break
 
diff --git a/lib/matplotlib/afm.py b/lib/matplotlib/afm.py
@@ -91,7 +91,7 @@ def _sanity_check(fh):
     # do something else with the file.
     pos = fh.tell()
     try:
-        line = fh.readline()
+        line = next(fh)
     finally:
         fh.seek(pos, 0)
 
@@ -148,10 +148,7 @@ def _parse_header(fh):
         }
 
     d = {}
-    while 1:
-        line = fh.readline()
-        if not line:
-            break
+    for line in fh:
         line = line.rstrip()
         if line.startswith(b'Comment'):
             continue
@@ -191,10 +188,7 @@ def _parse_char_metrics(fh):
 
     ascii_d = {}
     name_d = {}
-    while 1:
-        line = fh.readline()
-        if not line:
-            break
+    for line in fh:
         line = line.rstrip().decode('ascii')  # Convert from byte-literal
         if line.startswith('EndCharMetrics'):
             return ascii_d, name_d
@@ -231,20 +225,17 @@ def _parse_kern_pairs(fh):
 
     """
 
-    line = fh.readline()
+    line = next(fh)
     if not line.startswith(b'StartKernPairs'):
         raise RuntimeError('Bad start of kern pairs data: %s' % line)
 
     d = {}
-    while 1:
-        line = fh.readline()
-        if not line:
-            break
+    for line in fh:
         line = line.rstrip()
-        if len(line) == 0:
+        if not line:
             continue
         if line.startswith(b'EndKernPairs'):
-            fh.readline()  # EndKernData
+            next(fh)  # EndKernData
             return d
         vals = line.split()
         if len(vals) != 4 or vals[0] != b'KPX':
@@ -269,10 +260,7 @@ def _parse_composites(fh):
 
     """
     d = {}
-    while 1:
-        line = fh.readline()
-        if not line:
-            break
+    for line in fh:
         line = line.rstrip()
         if len(line) == 0:
             continue
@@ -306,12 +294,9 @@ def _parse_optional(fh):
         }
 
     d = {b'StartKernData': {}, b'StartComposites': {}}
-    while 1:
-        line = fh.readline()
-        if not line:
-            break
+    for line in fh:
         line = line.rstrip()
-        if len(line) == 0:
+        if not line:
             continue
         key = line.split()[0]
 
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -392,25 +392,15 @@ def _plot_args(self, tup, kwargs):
         return ret
 
     def _grab_next_args(self, *args, **kwargs):
-
-        remaining = args
-        while 1:
-
-            if len(remaining) == 0:
-                return
-            if len(remaining) <= 3:
-                for seg in self._plot_args(remaining, kwargs):
-                    yield seg
+        while True:
+            if not args:
                 return
-
-            if is_string_like(remaining[2]):
-                isplit = 3
-            else:
-                isplit = 2
-
-            for seg in self._plot_args(remaining[:isplit], kwargs):
+            this, args = args[:2], args[2:]
+            if args and is_string_like(args[0]):
+                this += args[0],
+                args = args[1:]
+            for seg in self._plot_args(this, kwargs):
                 yield seg
-            remaining = remaining[isplit:]
 
 
 class _AxesBase(martist.Artist):
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -1638,55 +1638,48 @@ def pstoeps(tmpfile, bbox=None, rotated=False):
         bbox_info, rotate = None, None
 
     epsfile = tmpfile + '.eps'
-    with io.open(epsfile, 'wb') as epsh:
+    with io.open(epsfile, 'wb') as epsh, io.open(tmpfile, 'rb') as tmph:
         write = epsh.write
-        with io.open(tmpfile, 'rb') as tmph:
-            line = tmph.readline()
-            # Modify the header:
-            while line:
-                if line.startswith(b'%!PS'):
-                    write(b"%!PS-Adobe-3.0 EPSF-3.0\n")
-                    if bbox:
-                        write(bbox_info.encode('ascii') + b'\n')
-                elif line.startswith(b'%%EndComments'):
-                    write(line)
-                    write(b'%%BeginProlog\n')
-                    write(b'save\n')
-                    write(b'countdictstack\n')
-                    write(b'mark\n')
-                    write(b'newpath\n')
-                    write(b'/showpage {} def\n')
-                    write(b'/setpagedevice {pop} def\n')
-                    write(b'%%EndProlog\n')
-                    write(b'%%Page 1 1\n')
-                    if rotate:
-                        write(rotate.encode('ascii') + b'\n')
-                    break
-                elif bbox and (line.startswith(b'%%Bound') \
-                               or line.startswith(b'%%HiResBound') \
-                               or line.startswith(b'%%DocumentMedia') \
-                               or line.startswith(b'%%Pages')):
-                    pass
-                else:
-                    write(line)
-                line = tmph.readline()
-            # Now rewrite the rest of the file, and modify the trailer.
-            # This is done in a second loop such that the header of the embedded
-            # eps file is not modified.
-            line = tmph.readline()
-            while line:
-                if line.startswith(b'%%EOF'):
-                    write(b'cleartomark\n')
-                    write(b'countdictstack\n')
-                    write(b'exch sub { end } repeat\n')
-                    write(b'restore\n')
-                    write(b'showpage\n')
-                    write(b'%%EOF\n')
-                elif line.startswith(b'%%PageBoundingBox'):
-                    pass
-                else:
-                    write(line)
-                line = tmph.readline()
+        # Modify the header:
+        for line in tmph:
+            if line.startswith(b'%!PS'):
+                write(b"%!PS-Adobe-3.0 EPSF-3.0\n")
+                if bbox:
+                    write(bbox_info.encode('ascii') + b'\n')
+            elif line.startswith(b'%%EndComments'):
+                write(line)
+                write(b'%%BeginProlog\n'
+                      b'save\n'
+                      b'countdictstack\n'
+                      b'mark\n'
+                      b'newpath\n'
+                      b'/showpage {} def\n'
+                      b'/setpagedevice {pop} def\n'
+                      b'%%EndProlog\n'
+                      b'%%Page 1 1\n')
+                if rotate:
+                    write(rotate.encode('ascii') + b'\n')
+                break
+            elif bbox and line.startswith((b'%%Bound', b'%%HiResBound',
+                                           b'%%DocumentMedia', b'%%Pages')):
+                pass
+            else:
+                write(line)
+        # Now rewrite the rest of the file, and modify the trailer.
+        # This is done in a second loop such that the header of the embedded
+        # eps file is not modified.
+        for line in tmph:
+            if line.startswith(b'%%EOF'):
+                write(b'cleartomark\n'
+                      b'countdictstack\n'
+                      b'exch sub { end } repeat\n'
+                      b'restore\n'
+                      b'showpage\n'
+                      b'%%EOF\n')
+            elif line.startswith(b'%%PageBoundingBox'):
+                pass
+            else:
+                write(line)
 
     os.remove(tmpfile)
     shutil.move(epsfile, tmpfile)
diff --git a/lib/matplotlib/backends/tkagg.py b/lib/matplotlib/backends/tkagg.py
@@ -40,4 +40,4 @@ def test(aggimage):
     blit(p, aggimage)
     c.create_image(aggimage.width,aggimage.height,image=p)
     blit(p, aggimage)
-    while 1: r.update_idletasks()
+    while True: r.update_idletasks()
diff --git a/lib/matplotlib/bezier.py b/lib/matplotlib/bezier.py
@@ -113,7 +113,7 @@ def find_bezier_t_intersecting_with_closedpath(bezier_point_at_t,
 
     - bezier_point_at_t : a function which returns x, y coordinates at *t*
 
-    - inside_closedpath : return True if the point is insed the path
+    - inside_closedpath : return True if the point is inside the path
 
     """
     # inside_closedpath : function
@@ -124,17 +124,14 @@ def find_bezier_t_intersecting_with_closedpath(bezier_point_at_t,
     start_inside = inside_closedpath(start)
     end_inside = inside_closedpath(end)
 
-    if start_inside == end_inside:
-        if start != end:
-            raise NonIntersectingPathException(
-                "the segment does not seem to intersect with the path"
-            )
+    if start_inside == end_inside and start != end:
+        raise NonIntersectingPathException(
+            "Both points are on the same side of the closed path")
 
-    while 1:
+    while True:
 
         # return if the distance is smaller than the tolerence
-        if (start[0] - end[0]) ** 2 + \
-           (start[1] - end[1]) ** 2 < tolerence ** 2:
+        if np.hypot(start[0] - end[0], start[1] - end[1]) < tolerence:
             return t0, t1
 
         # calculate the middle point
diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
@@ -1150,7 +1150,7 @@ def tick_values(self, vmin, vmax):
         ymax = self.base.ge(vmax.year)
 
         ticks = [vmin.replace(year=ymin, **self.replaced)]
-        while 1:
+        while True:
             dt = ticks[-1]
             if dt.year >= ymax:
                 return date2num(ticks)
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -2908,7 +2908,7 @@ def get_converters(reader, comments):
     process_skiprows(reader)
 
     if needheader:
-        while 1:
+        while True:
             # skip past any comments and consume one line of column header
             row = next(reader)
             if (len(row) and comments is not None and
