Python cleaning

setup.py

@@ -1,6 +1,5 @@
 from distutils.core import setup
 from py2exe import *
-from glob import glob
 import os
 
 version = os.environ.get("version")
@@ -39,8 +38,6 @@ def __init__(self, **kw):
     cmdline_style='pywin32'
 )
 
-#data_files = [("Microsoft.VC90.CRT", glob(r'redist\VC90\Microsoft.VC90.CRT-'+architecture+'\*.*'))]
-
 setup(
     version = version,
     package_dir = {'': 'src'},

src/WpkgConfig.py

@@ -3,7 +3,7 @@
 import os.path
 import base64
 import logging
-import win32crypt, pywintypes
+import win32crypt
 import re
 import datetime
 

src/WpkgNetworkHandler.py

@@ -105,7 +105,6 @@ def connect_to_network_share(self):
                     logger.info("Tried to connect to share '%s', but a connection already exists. Will disconnect, and retry." % self.network_share)
                     self.connected = True
                     self.disconnect_from_network_share()
-                    pass
                 elif n == winerror.ERROR_BAD_NETPATH or n == winerror.ERROR_NETWORK_UNREACHABLE: # 53_ Network path not found | 1231Network location cannot be reached
                     # This can indicate that the network path was wrong, or that the network is not available yet
                     logger.info("An issue occured when connecting to '%s', the error code is %i and the error string is '%s'" % (self.network_share, n, e))

src/WpkgPipeClient.py

@@ -13,7 +13,7 @@
 import pywintypes
 import win32api
 import winerror
-import sys, os, traceback
+import os
 
 debug = 0
 def setNetworkUser(username,password):

src/WpkgServer.py

@@ -18,9 +18,8 @@
 import WpkgLGPUpdater
 import WpkgTranslator
 import WpkgConfig
-import _winreg, logging, logging.handlers
-import os.path, sys
-import gettext
+import logging, logging.handlers
+import os.path
 
 MY_PIPE_NAME = r"\\.\pipe\WPKG"
 # From http://msdn.microsoft.com/en-us/library/aa379649%28VS.85%29.aspx

src/WpkgWriter.py

@@ -1,5 +1,4 @@
 # -*- encoding: utf-8 -*-
-import sys
 import logging
 import win32file
 import pywintypes

src/configobj.py

@@ -87,7 +87,6 @@ def match_utf8(encoding):
 
 try:
     any
-except NameError:
     def any(iterable):
         for entry in iterable:
             if entry:

src/reboot.py

@@ -1,7 +1,6 @@
 # RebootServer.py
 import win32security
 import win32api
-import sys, traceback
 import time
 from ntsecuritycon import *
 import servicemanager
@@ -55,4 +54,4 @@ def AbortReboot():
          print "Sleeping for 10 seconds"
          time.sleep(10)
          print "Aborting shutdown"
-         AbortReboot()
+         AbortReboot()