Start reformatting for better pylint coverage

diff --git a/curses-crossword.py b/curses-crossword.py
index 6d8791a64cfeda7e96a2fcfc145c74270431c898..662fa17b920611aed25160602e4351781e0f3be3 100644 (file)
--- a/curses-crossword.py
+++ b/curses-crossword.py
@@ -27,7 +27,7 @@ try:
         "9": unichr(8313).encode(code),
     }
 except:
         "9": unichr(8313).encode(code),
     }
 except:

-    for number in range(0,10):
+    for number in range(0, 10):

         superscript_numbers[str(number)] = str(number)
 
 filename = None
         superscript_numbers[str(number)] = str(number)
 
 filename = None


@@ -59,7 +59,11 @@ def parsecrossword(crossworddata):
     ingrid = False
     inacross = False
     indown = False
     ingrid = False
     inacross = False
     indown = False

-    crossword = {"grid": [], "across": {}, "down": {}, "grid_questions_start": [], "grid_questions_end": []}
+    crossword = {"grid": [],
+        "across": {},
+        "down": {},
+        "grid_questions_start": [],
+        "grid_questions_end": []}

 
     for line in crossworddata.split("\n"):
         line = line.strip("\n")
 
     for line in crossworddata.split("\n"):
         line = line.strip("\n")


@@ -84,7 +88,8 @@ def parsecrossword(crossworddata):
                     parts = line.split()
                     question_number = int(parts[0])
                     clue = " ".join(parts[1:])
                     parts = line.split()
                     question_number = int(parts[0])
                     clue = " ".join(parts[1:])

-                    crossword["across"][int(question_number)] = clue.encode(code)
+                    crossword["across"][int(question_number)] = \
+                        clue.encode(code)

             if indown:
                 if line != "":
                     parts = line.split()
             if indown:
                 if line != "":
                     parts = line.split()


@@ -96,11 +101,11 @@ def parsecrossword(crossworddata):
 
     current_clue_number = 1
 
 
     current_clue_number = 1
 

-    for row in range(0,num_rows):
+    for row in range(0, num_rows):

         crossword["grid_questions_start"].append([])
 
         crossword["grid_questions_start"].append([])
 

-    for row in range(0,num_rows):
-        for col in range(0,num_cols):
+    for row in range(0, num_rows):
+        for col in range(0, num_cols):

             have_clue = False
             if col > 0 \
                 and crossword["grid"][row][col - 1] == "x" \
             have_clue = False
             if col > 0 \
                 and crossword["grid"][row][col - 1] == "x" \


@@ -120,7 +125,8 @@ def parsecrossword(crossworddata):
                 and crossword["grid"][row + 1][col] != "x":
                 have_clue = True
             if have_clue:
                 and crossword["grid"][row + 1][col] != "x":
                 have_clue = True
             if have_clue:

-                crossword["grid_questions_start"][row].append(current_clue_number)
+                crossword["grid_questions_start"][row] \
+                    .append(current_clue_number)

                 current_clue_number += 1
             else:
                 crossword["grid_questions_start"][row].append(0)
                 current_clue_number += 1
             else:
                 crossword["grid_questions_start"][row].append(0)


@@ -143,11 +149,11 @@ def crossword(stdscr, crossworddata):
     curx -= 1
     stdscr.addch(cury, curx, curses.ACS_URCORNER)
     cury += 1
     curx -= 1
     stdscr.addch(cury, curx, curses.ACS_URCORNER)
     cury += 1

-    curgridy=0
+    curgridy = 0

     for line in crossword["grid"]:
         datastr = ""
         curx = 0
     for line in crossword["grid"]:
         datastr = ""
         curx = 0

-        curgridx=0
+        curgridx = 0

         for c in line:
             stdscr.addch(cury, curx, curses.ACS_VLINE)
             if curx > 0:
         for c in line:
             stdscr.addch(cury, curx, curses.ACS_VLINE)
             if curx > 0:


@@ -163,7 +169,13 @@ def crossword(stdscr, crossworddata):
                 stdscr.addch(cury, curx+1, curses.ACS_BLOCK)
                 stdscr.addch(cury, curx+2, curses.ACS_BLOCK)
             elif crossword["grid_questions_start"][curgridy][curgridx] > 0:
                 stdscr.addch(cury, curx+1, curses.ACS_BLOCK)
                 stdscr.addch(cury, curx+2, curses.ACS_BLOCK)
             elif crossword["grid_questions_start"][curgridy][curgridx] > 0:

-                stdscr.addstr(cury, curx, ''.join([superscript_numbers[x].decode(code) for x in str(crossword["grid_questions_start"][curgridy][curgridx])]).encode(code))
+                stdscr.addstr(cury, curx, \
+                    ''.join( \
+                        [superscript_numbers[x].decode(code) \
+                        for x in str( \
+                            crossword["grid_questions_start"] \
+                            [curgridy][curgridx])]\
+                        ).encode(code))

             curx += 3
             curgridx += 1
         else:
             curx += 3
             curgridx += 1
         else:


@@ -189,14 +201,16 @@ def crossword(stdscr, crossworddata):
     stdscr.addstr(cury, curx, "Across")
     cury += 1
     for cluenumber in crossword["across"].keys():
     stdscr.addstr(cury, curx, "Across")
     cury += 1
     for cluenumber in crossword["across"].keys():

-        stdscr.addstr(cury, curx, "%3s: %s" %(str(cluenumber), crossword["across"][cluenumber]))
+        stdscr.addstr(cury, curx, "%3s: %s" \
+            %(str(cluenumber), crossword["across"][cluenumber]))

         cury += 1
 
     cury += 1
     stdscr.addstr(cury, curx, "Down")
     cury += 1
     for cluenumber in crossword["down"].keys():
         cury += 1
 
     cury += 1
     stdscr.addstr(cury, curx, "Down")
     cury += 1
     for cluenumber in crossword["down"].keys():

-        stdscr.addstr(cury, curx, "%3s: %s" %(str(cluenumber), crossword["down"][cluenumber]))
+        stdscr.addstr(cury, curx, "%3s: %s" \
+            %(str(cluenumber), crossword["down"][cluenumber]))

         cury += 1
 
     curx = 3
         cury += 1
 
     curx = 3


@@ -208,7 +222,7 @@ def crossword(stdscr, crossworddata):
         curx += 4
         gridx += 1
 
         curx += 4
         gridx += 1
 

-    stdscr.move(cury,curx)
+    stdscr.move(cury, curx)

 
     while 1:
         c = stdscr.getch()
 
     while 1:
         c = stdscr.getch()


@@ -232,8 +246,8 @@ def crossword(stdscr, crossworddata):
                 gridx -= 1
                 while gridx > 0 \
                     and crossword["grid"][gridy][gridx] == "x":
                 gridx -= 1
                 while gridx > 0 \
                     and crossword["grid"][gridy][gridx] == "x":

-                        gridx -= 1
-                        curx -= 4
+                    gridx -= 1
+                    curx -= 4

                 while crossword["grid"][gridy][gridx] == "x":
                     gridx += 1
                     curx += 4
                 while crossword["grid"][gridy][gridx] == "x":
                     gridx += 1
                     curx += 4


@@ -244,8 +258,8 @@ def crossword(stdscr, crossworddata):
                 cury -= 2
                 while gridy > 0 \
                     and crossword["grid"][gridy][gridx] == "x":
                 cury -= 2
                 while gridy > 0 \
                     and crossword["grid"][gridy][gridx] == "x":

-                        gridy -= 1
-                        cury -= 2
+                    gridy -= 1
+                    cury -= 2

                 while crossword["grid"][gridy][gridx] == "x":
                     gridy += 1
                     cury += 2
                 while crossword["grid"][gridy][gridx] == "x":
                     gridy += 1
                     cury += 2