[CalendarServer-changes] [14106] CalendarServer/trunk/calendarserver/tools/dashboard.py

[source_changes at macosforge.org]

Revision: 14106
          http://trac.calendarserver.org//changeset/14106
Author:   cdaboo at apple.com
Date:     2014-10-27 07:46:37 -0700 (Mon, 27 Oct 2014)
Log Message:
-----------
Clean-up.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/dashboard.py

Modified: CalendarServer/trunk/calendarserver/tools/dashboard.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/dashboard.py	2014-10-27 14:39:17 UTC (rev 14105)
+++ CalendarServer/trunk/calendarserver/tools/dashboard.py	2014-10-27 14:46:37 UTC (rev 14106)
@@ -21,18 +21,21 @@
 
 from getopt import getopt, GetoptError
 
-import curses
 import curses.panel
+import errno
+import fcntl
 import json
+import logging
 import os
 import sched
+import socket
+import struct
 import sys
+import termios
 import time
-import socket
-import errno
-import logging
+
 LOG_FILENAME = 'db.log'
-#logging.basicConfig(filename=LOG_FILENAME,level=logging.DEBUG)
+# logging.basicConfig(filename=LOG_FILENAME,level=logging.DEBUG)
 
 
 
@@ -115,6 +118,18 @@
 
 
 
+def terminal_size():
+    h, w, _ignore_hp, _ignore_wp = struct.unpack(
+        'HHHH',
+        fcntl.ioctl(
+            0, termios.TIOCGWINSZ,
+            struct.pack('HHHH', 0, 0, 0, 0)
+        )
+    )
+    return w, h
+
+
+
 class Dashboard(object):
     """
     Main dashboard controller. Use Python's L{sched} feature to schedule
@@ -156,12 +171,6 @@
         self.sched.enter(self.seconds, 0, self.updateDisplay, ())
         self.sched.run()
 
-    def terminal_size(self):
-        import fcntl, termios, struct
-        h, w, hp, wp = struct.unpack('HHHH',
-            fcntl.ioctl(0, termios.TIOCGWINSZ,
-            struct.pack('HHHH', 0, 0, 0, 0)))
-        return w, h
 
     def displayWindow(self, wtype):
         """
@@ -192,12 +201,12 @@
             ordered_windows = [self.registered_windows[i] for i in self.registered_order]
             for wtype in filter(lambda x: x.all, ordered_windows):
                 new_win = wtype(self.usesCurses, self.client).makeWindow(top=top)
-                logging.debug('created %r at panel level %r' % (new_win,new_win.z_order))
+                logging.debug('created %r at panel level %r' % (new_win, new_win.z_order))
                 self.windows.append(wtype(self.usesCurses, self.client).makeWindow(top=top))
                 self.windows[-1].activate()
                 top += self.windows[-1].nlines + 1
             # Don't display help panel if the window is too narrow
-            term_w, term_h = self.terminal_size()
+            term_w, term_h = terminal_size()
             logging.debug("logger displayWindow: rows: %s  cols: %s" % (term_h, term_w))
             if int(term_w) > 100:
                 logging.debug('term_w > 100, making window with top at %d' % (top))
@@ -376,14 +385,6 @@
         self.z_order = 'bottom'
 
 
-    def terminal_size(self):
-        import fcntl, termios, struct
-        h, w, hp, wp = struct.unpack('HHHH',
-            fcntl.ioctl(0, termios.TIOCGWINSZ,
-            struct.pack('HHHH', 0, 0, 0, 0)))
-        return w, h
-
-
     def makeWindow(self, top=0, left=0):
         raise NotImplementedError()
 
@@ -478,12 +479,12 @@
     )
 
     def makeWindow(self, top=0, left=0):
-        term_w, term_h = self.terminal_size()
+        term_w, _ignore_term_h = terminal_size()
         help_x_offset = term_w - BOX_WIDTH + 4
         self._createWindow(
             "Help",
             len(self.helpItems) + len(Dashboard.registered_windows) + 2,
-            ncols=BOX_WIDTH-4,
+            ncols=BOX_WIDTH - 4,
             begin_y=0,
             begin_x=help_x_offset,
         )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20141027/cc4601f5/attachment.html>