pep8 and use color printer #134

Author: pcottle

src/__tests__/screenForTest.py

@@ -114,7 +114,7 @@ def getRowsWithAttributesForPastScreens(self, pastScreens):
         pages = map(lambda screenIndex: self.getRowsWithAttributes(
             screen=self.pastScreens[screenIndex]), pastScreens)
 
-        #join the pages together into one stream
+        # join the pages together into one stream
         lines, attributes = zip(*pages)
         return ([line for page in lines for line in page],
                 [line for page in attributes for line in page])

src/format.py

@@ -206,12 +206,12 @@ def output(self, printer):
         if (y < miny or y >= maxy):
             # wont be displayed!
             return
-        
+
         # we dont care about the after text, but we should be able to see
         # all of the decorated match (which means we need to see up to
         # the end of the decoratedMatch, aka include beforeText)
         importantTextLength = len(str(self.beforeText)) + \
-                              len(str(self.decoratedMatch))
+            len(str(self.decoratedMatch))
         spaceForPrinting = maxx - minx
         if importantTextLength > spaceForPrinting:
             # hrm, we need to update our decorated match to show
@@ -223,7 +223,7 @@ def output(self, printer):
         else:
             # first check what our expanded size would be:
             expandedSize = len(str(self.beforeText)) + \
-              len(self.getMatch())
+                len(self.getMatch())
             if expandedSize < spaceForPrinting and self.isTruncated:
                 # if the screen gets resized, we might be truncated
                 # from a previous render but **now** we have room.

src/screenControl.py

@@ -392,7 +392,6 @@ def getHoveredFiles(self):
                 if index == self.hoverIndex]
 
     def showAndGetCommand(self):
-        self.stdscr.attrset(0)
         fileObjs = self.getFilesToUse()
         files = [fileObj.getFile() for fileObj in fileObjs]
         (maxy, maxx) = self.getScreenDimensions()
@@ -409,26 +408,26 @@ def showAndGetCommand(self):
         # first lets print all the files
         startHeight = halfHeight - 1 - len(files)
         try:
-            self.stdscr.addstr(startHeight - 3, 0, borderLine)
-            self.stdscr.addstr(startHeight - 2, 0, SHORT_FILES_HEADER)
-            self.stdscr.addstr(startHeight - 1, 0, borderLine)
+            self.colorPrinter.addstr(startHeight - 3, 0, borderLine)
+            self.colorPrinter.addstr(startHeight - 2, 0, SHORT_FILES_HEADER)
+            self.colorPrinter.addstr(startHeight - 1, 0, borderLine)
             for index, file in enumerate(files):
-                self.stdscr.addstr(startHeight + index, 0,
-                                   file[0:maxFileLength])
+                self.colorPrinter.addstr(startHeight + index, 0,
+                                         file[0:maxFileLength])
         except curses.error:
             pass
 
         # first print prompt
         try:
-            self.stdscr.addstr(halfHeight, 0, SHORT_COMMAND_PROMPT)
-            self.stdscr.addstr(halfHeight + 1, 0, SHORT_COMMAND_PROMPT2)
+            self.colorPrinter.addstr(halfHeight, 0, SHORT_COMMAND_PROMPT)
+            self.colorPrinter.addstr(halfHeight + 1, 0, SHORT_COMMAND_PROMPT2)
         except curses.error:
             pass
         # then line to distinguish and prompt line
         try:
-            self.stdscr.addstr(halfHeight - 1, 0, borderLine)
-            self.stdscr.addstr(halfHeight + 2, 0, borderLine)
-            self.stdscr.addstr(halfHeight + 3, 0, promptLine)
+            self.colorPrinter.addstr(halfHeight - 1, 0, borderLine)
+            self.colorPrinter.addstr(halfHeight + 2, 0, borderLine)
+            self.colorPrinter.addstr(halfHeight + 3, 0, promptLine)
         except curses.error:
             pass