Fixed Python 2.6 errors.

Author: Nurdok

pep257.py

@@ -726,7 +726,7 @@ def check(filenames, select=None, ignore=None):
 
 def get_options(args, opt_parser):
     config = RawConfigParser()
-    parent = tail = args and os.path.abspath(os.path.commonprefix(args))
+    parent = tail = os.path.abspath(os.path.commonprefix(args))
     while tail:
         for fn in PROJECT_CONFIG:
             full_path = os.path.join(parent, fn)
@@ -811,7 +811,7 @@ def validate_options(options):
     mutually_exclusive = ('ignore', 'select', 'convention')
     for opt1, opt2 in itertools.permutations(mutually_exclusive, 2):
         if getattr(options, opt1) and getattr(options, opt2):
-            log.error('Cannot pass both {} and {}. They are '
+            log.error('Cannot pass both {0} and {1}. They are '
                       'mutually exclusive.'.format(opt1, opt2))
             return False
     if options.convention and not hasattr(Conventions, options.convention):

test_pep257.py

@@ -93,6 +93,9 @@ def function_with_bad_docstring(foo):
         error_codes = set(error.code for error in errors)
         assert error_codes == expected_error_codes
 
+    # We need to recreate the mock, otherwise the read file is empty
+    mock_open = mock.mock_open(read_data=function_to_check)
+    with mock.patch('pep257.tokenize_open', mock_open, create=True):
         errors = tuple(pep257.check(['filepath'], ignore=['D100', 'D202']))
         error_codes = set(error.code for error in errors)
         assert error_codes == expected_error_codes - set(('D100', 'D202'))