cleanup / lint fixes

6 files changed, 7 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index fba7620..2169887 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ ChangeLog for PyLint
  --
     * include a modified version of Maarten ter Huurne patch of avoid W0613
       warning on arguments from overridden method
+    * add epylint.bat script to fix Windows installation
 	
 2008-10-13  --  0.15.2
     * fix #5672: W0706 weirdness ( W0706 removed )
diff --git a/MANIFEST.in b/MANIFEST.in
index 302fe08..d446b35 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,10 +4,10 @@ include ChangeLog
 include TODO
 include bin/symilar
 include bin/pylint
-include bin/*.bat
 include bin/pylint-gui
 include bin/epylint
 include bin/pyreverse
+include bin/*.bat
 include examples/pylintrc*
 include examples/*.py
 include elisp/*.el
diff --git a/checkers/imports.py b/checkers/imports.py
index 0fc7d86..76b9fa7 100644
--- a/checkers/imports.py
+++ b/checkers/imports.py
@@ -263,7 +263,7 @@ given file (report R0402 must not be disabled)'}
 
     def _module_not_exists(self, node, modname):
         """check if module exists and possibly add message"""
-        result, errors = expand_modules([modname], [])
+        errors = expand_modules([modname], [])[1]
         if not errors or is_relative(modname, node.root().file):
             return False
         error = errors[0]
diff --git a/checkers/rpython.py b/checkers/rpython.py
index e2239d5..a2553b3 100644
--- a/checkers/rpython.py
+++ b/checkers/rpython.py
@@ -305,11 +305,9 @@ class RPythonChecker(BaseChecker):
         """check we are not modifying a module attribute"""
         if not self._rpython:
             return
-        frame = node.frame()
         if not node.name in node.frame().locals:
             self.add_message('E1220', node=node,
                              args=(node.name, node.root().name))
-            
         
     def visit_slice(self, node):
         """no negative index"""
diff --git a/checkers/typecheck.py b/checkers/typecheck.py
index cbcbddd..b843f73 100644
--- a/checkers/typecheck.py
+++ b/checkers/typecheck.py
@@ -129,7 +129,7 @@ accessed.'}
             except AttributeError:
                 # XXX method / function
                 continue
-            except astng.NotFoundError, ex:
+            except astng.NotFoundError:
                 if isinstance(owner, astng.Instance) \
                        and owner.has_dynamic_getattr():
                     continue
diff --git a/utils.py b/utils.py
index c97ecdf..591aeb7 100644
--- a/utils.py
+++ b/utils.py
@@ -385,7 +385,7 @@ class ReportsHandlerMixIn:
 
 from os.path import dirname, basename, splitext, exists, isdir, join, normpath
 from logilab.common.modutils import modpath_from_file, get_module_files, \
-                                    file_from_modpath, is_relative
+                                    file_from_modpath
 
 def expand_modules(files_or_modules, black_list):
     """take a list of files/modules/packages and return the list of tuple
@@ -413,8 +413,8 @@ def expand_modules(files_or_modules, black_list):
                     errors.append( {'key' : 'F0003', 'mod': modname} )
                     continue
             except ImportError, ex:
-                    errors.append( {'key': 'F0001', 'mod': modname, 'ex': ex} )
-                    continue
+                errors.append( {'key': 'F0001', 'mod': modname, 'ex': ex} )
+                continue
         filepath = normpath(filepath)
         result.append( {'path': filepath, 'name': modname,
                         'basepath': filepath, 'basename': modname} )