Rewrite without using try-except to break out of two loops.

diff --git a/Lib/test/test_nis.py b/Lib/test/test_nis.py
index 2afe1117326c8e74ad258d1ad5bd698d3a1078be..4f78932306a8deef5eccac96b9302f5491f44264 100644 (file)
--- a/Lib/test/test_nis.py
+++ b/Lib/test/test_nis.py
@@ -5,21 +5,22 @@ if __name__ == '__main__':
     verbose = 1
 
 maps = nis.maps()
-try:
-    for nismap in maps:
+done = 0
+for nismap in maps:
+    if verbose:
+       print nismap
+    mapping = nis.cat(nismap)
+    for k, v in mapping.items():
        if verbose:
-           print nismap
-       mapping = nis.cat(nismap)
-       for k, v in mapping.items():
-           if verbose:
-               print '    ', k, v
-           if not k:
-               continue
-           if nis.match(k, nismap) <> v:
-               print "NIS match failed for key `%s' in map `%s'" % (k, nismap)
-           else:
-               # just test the one key, otherwise this test could take a
-               # very long time
-               raise 'done'
-except 'done':
-    pass
+           print '    ', k, v
+       if not k:
+           continue
+       if nis.match(k, nismap) <> v:
+           print "NIS match failed for key `%s' in map `%s'" % (k, nismap)
+       else:
+           # just test the one key, otherwise this test could take a
+           # very long time
+           done = 1
+           break
+    if done:
+       break