Merge branch 'master' into singularity

gui/characterEditor.py

@@ -734,9 +734,6 @@ class APIView(wx.Panel):
         self.stDisabledTip.Wrap(-1)
         hintSizer.Add(self.stDisabledTip, 0, wx.TOP | wx.BOTTOM, 10)
 
-
-
-
         self.stDisabledTip.Hide()
         hintSizer.AddStretchSpacer()
         pmainSizer.Add(hintSizer, 0, wx.EXPAND, 5)

service/server.py

@@ -3,6 +3,7 @@ import urllib.parse
 import socket
 import threading
 from logbook import Logger
+import socketserver
 
 pyfalog = Logger(__name__)
 
@@ -103,7 +104,6 @@ class AuthHandler(http.server.BaseHTTPRequestHandler):
     def log_message(self, format, *args):
         return
 
-import socketserver
 
 # http://code.activestate.com/recipes/425210-simple-stoppable-server-using-socket-timeout/
 class StoppableHTTPServer(socketserver.TCPServer):