pep8: fixed issue with shadowing reserved python variables.

vcsserver/hg.py

@@ -389,14 +389,14 b' class HgRemote(object):'
         repo = self._factory.repo(wire)
 
         if file_filter:
-            filter = match(file_filter[0], '', [file_filter[1]])
+            match_filter = match(file_filter[0], '', [file_filter[1]])
         else:
-            filter = file_filter
+            match_filter = file_filter
         opts = diffopts(git=opt_git, ignorews=opt_ignorews, context=context)
 
         try:
             return "".join(patch.diff(
-                repo, node1=rev1, node2=rev2, match=filter, opts=opts))
+                repo, node1=rev1, node2=rev2, match=match_filter, opts=opts))
         except RepoLookupError:
             raise exceptions.LookupException()
 

vcsserver/svn_diff.py

@@ -76,12 +76,14 b' def filter_ignorable_lines(hunks, fromli'
         elif tag == 'replace' and (ignore_case or ignore_space_changes):
             if len(fromlines) != len(tolines):
                 return False
-            def f(str):
+
+            def f(input_str):
                 if ignore_case:
-                    str = str.lower()
+                    input_str = input_str.lower()
                 if ignore_space_changes:
-                    str = ' '.join(str.split())
-                return str
+                    input_str = ' '.join(input_str.split())
+                return input_str
+
             for i in range(len(fromlines)):
                 if f(fromlines[i]) != f(tolines[i]):
                     return False