@@ -3,3 +8,4 @@
 from PyQt4 import QtCore, QtGui
 
+
 class SettingsMixin(object):

@@ -5,2 +10,4 @@
+
 class SettingsMixin(object):
+    """Mixin for adding geometry and state saving between restarts."""
     def warnIfNoObjectName(self):

@@ -11,2 +21,4 @@
+
     def writeState(self, source):
+        """Save object state (e.g. relative position of a splitter)"""
         self.warnIfNoObjectName()

@@ -18,3 +30,4 @@
     def writeGeometry(self, source):
+        """Save object geometry (e.g. window size and position)"""
         self.warnIfNoObjectName()
         settings = QtCore.QSettings()

@@ -26,3 +39,4 @@
+        """Load object geometry"""
         self.warnIfNoObjectName()
         settings = QtCore.QSettings()
         try:

@@ -35,4 +50,4 @@
         self.warnIfNoObjectName()
         settings = QtCore.QSettings()
         try:
             state = settings.value("/".join([str(self.objectName()), "state"]))

@@ -47,3 +64,3 @@
         self.readState(self)
-        
+
     def saveSettings(self):

@@ -49,2 +65,4 @@
+
     def saveSettings(self):
+        """Save main window settings"""
         self.writeState(self)

@@ -53,2 +71,4 @@
 
 class STableWidget(QtGui.QTableWidget, SettingsMixin):
+    """Table widget with Settings functionality"""
+    # pylint: disable=too-many-ancestors

@@ -56,3 +77,4 @@
         self.readState(self.horizontalHeader())
 
     def saveSettings(self):
+        """Save table settings."""

@@ -59,3 +81,3 @@
         self.writeState(self.horizontalHeader())
 
-        
+

@@ -62,2 +84,4 @@
 class SSplitter(QtGui.QSplitter, SettingsMixin):
+    """Splitter with Settings functionality."""
     def loadSettings(self):
+        """Load splitter settings"""

@@ -67,2 +91,3 @@
+        """Save splitter settings."""
         self.writeState(self)
-        
+

@@ -68,3 +93,3 @@
-        
+
 
 class STreeWidget(QtGui.QTreeWidget, SettingsMixin):

@@ -71,3 +98,2 @@
     def loadSettings(self):
-        #recurse children
-        #self.readState(self)
+        """Load tree settings."""

@@ -76,3 +104,2 @@
     def saveSettings(self):
-        #recurse children
-        #self.writeState(self)
+        """Save tree settings"""

@@ -79,1 +105,4 @@
+        """Save tree settings"""
+        # recurse children
+        # self.writeState(self)
         pass

@@ -5,2 +12,4 @@
+
 
 class Socks5AuthError(ProxyError):
+    """Thrown when the socks5 protocol encounters an authentication error"""

@@ -24,1 +26,3 @@
-        "Unknown error")
+                  "General SOCKS server failure",
+                  "Connection not allowed by ruleset",
+                  "Network unreachable",

@@ -42,3 +54,4 @@
+        """Perform authentication if peer is requesting it."""
         ret = struct.unpack('BB', self.read_buf[:2])
         if ret[0] != 5:
             # general error

@@ -98,3 +113,4 @@
     def state_proxy_addr_1(self):
+        """Handle IPv4 address returned for peer"""
         self.boundaddr = self.read_buf[0:4]
         self.set_state("proxy_port", length=4, expectBytes=2)

@@ -131,3 +158,4 @@
     def state_auth_done(self):
+        """Request connection to be made"""
         # Now we can request the actual connection
         self.append_write_buf(struct.pack('BBB', 0x05, 0x01, 0x00))

@@ -151,6 +181,7 @@ class Socks5Connection(Socks5):
         return True
 

@@ -112,3 +136,4 @@
 
     def state_proxy_port(self):
+        """Handle peer's port being returned."""
         self.boundport = struct.unpack(">H", self.read_buf[0:2])[0]

@@ -112,3 +136,4 @@
 
     def state_proxy_port(self):
+        """Handle peer's port being returned."""
         self.boundport = struct.unpack(">H", self.read_buf[0:2])[0]