From 4470805b5f700e69dd41752737ace7eee952c6d0 Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval@progval.net>
Date: Tue, 3 Mar 2015 09:02:29 +0100
Subject: [PATCH] core: Remove useless imports.

---
 src/__init__.py   | 2 --
 src/callbacks.py  | 1 -
 src/cdb.py        | 1 -
 src/commands.py   | 2 --
 src/httpserver.py | 6 +-----
 src/i18n.py       | 3 ---
 src/ircdb.py      | 1 -
 src/irclib.py     | 4 ++--
 src/ircutils.py   | 2 +-
 src/registry.py   | 2 +-
 src/test.py       | 1 -
 src/world.py      | 2 +-
 12 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/src/__init__.py b/src/__init__.py
index 7e0950213..055e7cc07 100644
--- a/src/__init__.py
+++ b/src/__init__.py
@@ -28,8 +28,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 ###
 
-import sys
-import os.path
 import dynamicScope
 
 from . import utils
diff --git a/src/callbacks.py b/src/callbacks.py
index 2dcbb1548..6a93744e4 100644
--- a/src/callbacks.py
+++ b/src/callbacks.py
@@ -41,7 +41,6 @@ import shlex
 import codecs
 import getopt
 import inspect
-import operator
 
 if sys.version_info[0] < 3:
     # cStringIO is buggy with Python 2.6 (
diff --git a/src/cdb.py b/src/cdb.py
index 6a843fdb7..b8ce48cbf 100644
--- a/src/cdb.py
+++ b/src/cdb.py
@@ -184,7 +184,6 @@ class Reader(utils.IterableMap):
     """Class for reading from a CDB database."""
     def __init__(self, filename):
         self.filename = filename
-        import os
         self.fd = open(filename, 'rb')
         self.loop = 0
         self.khash = 0
diff --git a/src/commands.py b/src/commands.py
index f59442fda..2ff209c1a 100644
--- a/src/commands.py
+++ b/src/commands.py
@@ -34,12 +34,10 @@ Includes wrappers for commands.
 
 import time
 import Queue
-import types
 import getopt
 import inspect
 import threading
 import multiprocessing #python2.6 or later!
-import Queue
 
 try:
     import resource
diff --git a/src/httpserver.py b/src/httpserver.py
index 315aeaa62..ee9398904 100644
--- a/src/httpserver.py
+++ b/src/httpserver.py
@@ -35,12 +35,8 @@ import os
 import sys
 import cgi
 import socket
-from threading import Event, Thread
-from cStringIO import StringIO
-from SocketServer import ThreadingMixIn
+from threading import Thread
 from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
-# For testing purposes
-from SocketServer import StreamRequestHandler
 
 import supybot.log as log
 import supybot.conf as conf
diff --git a/src/i18n.py b/src/i18n.py
index 33150f626..2ad101248 100644
--- a/src/i18n.py
+++ b/src/i18n.py
@@ -34,11 +34,8 @@ Supybot internationalisation and localisation managment.
 __all__ = ['PluginInternationalization', 'internationalizeDocstring']
 
 import os
-import re
 import sys
-import time
 import weakref
-import threading
 conf = None
 # Don't import conf here ; because conf needs this module
 
diff --git a/src/ircdb.py b/src/ircdb.py
index 497baabfe..ba8ae9075 100644
--- a/src/ircdb.py
+++ b/src/ircdb.py
@@ -34,7 +34,6 @@ import time
 import operator
 
 from . import conf, ircutils, log, registry, unpreserve, utils, world
-from .utils.iter import imap, ilen, ifilter
 
 def isCapability(capability):
     return len(capability.split(None, 1)) == 1
diff --git a/src/irclib.py b/src/irclib.py
index 6e7c10e0d..c1d88d5a2 100644
--- a/src/irclib.py
+++ b/src/irclib.py
@@ -41,7 +41,7 @@ except ImportError:
 
 from . import conf, ircdb, ircmsgs, ircutils, log, utils, world
 from .utils.str import rsplit
-from .utils.iter import imap, chain, cycle
+from .utils.iter import chain
 from .utils.structures import queue, smallqueue, RingBuffer
 
 ###
@@ -481,7 +481,7 @@ class IrcState(IrcCommandDispatcher):
                 converter = self._005converters.get(name, lambda x: x)
                 try:
                     self.supported[name] = converter(value)
-                except Exception as e:
+                except Exception:
                     log.exception('Uncaught exception in 005 converter:')
                     log.error('Name: %s, Converter: %s', name, converter)
             else:
diff --git a/src/ircutils.py b/src/ircutils.py
index c7968954a..2cd853d8c 100644
--- a/src/ircutils.py
+++ b/src/ircutils.py
@@ -741,6 +741,6 @@ def standardSubstitute(irc, msg, text, env=None):
     return t.safe_substitute(vars)
 
 if __name__ == '__main__':
-    import sys, doctest
+    import doctest
     doctest.testmod(sys.modules['__main__'])
 # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79:
diff --git a/src/registry.py b/src/registry.py
index 7bc77043d..96b9d0b0c 100644
--- a/src/registry.py
+++ b/src/registry.py
@@ -144,7 +144,7 @@ def close(registry, filename, private=True):
                 else:
                     s = 'CENSORED'
                 fd.write('%s: %s\n' % (name, s))
-            except Exception as e:
+            except Exception:
                 exception('Exception printing value:')
     fd.close()
 
diff --git a/src/test.py b/src/test.py
index 7c5d68b52..acd810095 100644
--- a/src/test.py
+++ b/src/test.py
@@ -508,7 +508,6 @@ httpserver.http_servers = [httpserver.TestSupyHTTPServer()]
 # Partially stolen from the standard Python library :)
 def open_http(url, data=None):
     """Use HTTP protocol."""
-    import httplib
     user_passwd = None
     proxy_passwd= None
     if isinstance(url, str):
diff --git a/src/world.py b/src/world.py
index 933930fa0..888d52578 100644
--- a/src/world.py
+++ b/src/world.py
@@ -118,7 +118,7 @@ def flush():
     for (i, f) in enumerate(flushers):
         try:
             f()
-        except Exception as e:
+        except Exception:
             log.exception('Uncaught exception in flusher #%s (%s):', i, f)
 
 def debugFlush(s=''):