Modernize code to Python 3.6+ and some cleanup

02-array-seq/bisect_demo.py

@@ -11,11 +11,11 @@ Demonstration of ``bisect.bisect``::
     23 @ 11      |  |  |  |  |  |  |  |  |  |  |23
     22 @  9      |  |  |  |  |  |  |  |  |22
     10 @  5      |  |  |  |  |10
-     8 @  5      |  |  |  |  |8 
-     5 @  3      |  |  |5 
-     2 @  1      |2 
-     1 @  1      |1 
-     0 @  0    0 
+     8 @  5      |  |  |  |  |8
+     5 @  3      |  |  |5
+     2 @  1      |2
+     1 @  1      |1
+     0 @  0    0
 
 
 Demonstration of ``bisect.bisect_left``::
@@ -27,11 +27,11 @@ Demonstration of ``bisect.bisect_left``::
     23 @  9      |  |  |  |  |  |  |  |  |23
     22 @  9      |  |  |  |  |  |  |  |  |22
     10 @  5      |  |  |  |  |10
-     8 @  4      |  |  |  |8 
-     5 @  2      |  |5 
-     2 @  1      |2 
-     1 @  0    1 
-     0 @  0    0 
+     8 @  4      |  |  |  |8
+     5 @  2      |  |5
+     2 @  1      |2
+     1 @  0    1
+     0 @  0    0
 
 
 """
@@ -59,7 +59,7 @@ if __name__ == '__main__':
         bisect_fn = bisect.bisect
 
     print('DEMO:', bisect_fn.__name__)  # <5>
-    print('haystack ->', ' '.join('%2d' % n for n in HAYSTACK))
+    print('haystack ->', ' '.join(f'{n:2}' for n in HAYSTACK))
     demo(bisect_fn)
 
 # END BISECT_DEMO

02-array-seq/bisect_insort.py

@@ -7,6 +7,6 @@ random.seed(1729)
 
 my_list = []
 for i in range(SIZE):
-    new_item = random.randrange(SIZE*2)
+    new_item = random.randrange(SIZE * 2)
     bisect.insort(my_list, new_item)
-    print('%2d ->' % new_item, my_list)
+    print(f'{new_item:2} ->', my_list)

02-array-seq/listcomp_speed.py

@@ -10,7 +10,7 @@ def non_ascii(c):
 
 def clock(label, cmd):
     res = timeit.repeat(cmd, setup=SETUP, number=TIMES)
-    print(label, *('{:.3f}'.format(x) for x in res))
+    print(label, *(f'{x:.3f}' for x in res))
 
 clock('listcomp        :', '[ord(s) for s in symbols if ord(s) > 127]')
 clock('listcomp + func :', '[ord(s) for s in symbols if non_ascii(ord(s))]')

02-array-seq/metro_lat_long.py

@@ -4,7 +4,7 @@ metro_lat_long.py
 Demonstration of nested tuple unpacking::
 
     >>> main()
-                    |   lat.    |   long.  
+                    |   lat.    |   long.
     Mexico City     |   19.4333 |  -99.1333
     New York-Newark |   40.8086 |  -74.0204
     Sao Paulo       |  -23.5478 |  -46.6358
@@ -20,11 +20,10 @@ metro_areas = [
 ]
 
 def main():
-    print('{:15} | {:^9} | {:^9}'.format('', 'lat.', 'long.'))
-    fmt = '{:15} | {:9.4f} | {:9.4f}'
+    print(f'{"":15} | {"lat.":^9} | {"long.":^9}')
     for name, cc, pop, (latitude, longitude) in metro_areas:  # <2>
         if longitude <= 0:  # <3>
-            print(fmt.format(name, latitude, longitude))
+            print(f'{name:15} | {latitude:9.4f} | {longitude:9.4f}')
 
 if __name__ == '__main__':
     main()