#133: Hopefully last CR :)

Author: shacharoo

docs/release_notes.rst

@@ -22,7 +22,7 @@ New Features
   will now be checked by default instead of D203, which required a single
   blank line before a class docstring (#137).
 
-* Configuration files are now handles correctly. The closer a configuration file
+* Configuration files are now handled correctly. The closer a configuration file
   is to a checked file the more it matters.
   Configuration files no longer support ``explain``, ``source``, ``debug``,
   ``verbose`` or ``count`` (#133).

src/pep257.py

@@ -840,17 +840,17 @@ def _get_config(self, node):
         * If the current directory's configuration exists in
            `self._cache` - return it.
         * If a configuration file does not exist in this directory:
-        *   If the directory is not a root directory:
-        *     Cache its configuration as this directory's and return it.
-        *   Else:
-        *     Cache a default configuration and return it.
+          * If the directory is not a root directory:
+            * Cache its configuration as this directory's and return it.
+          * Else:
+            * Cache a default configuration and return it.
         * Else:
-        *   Read the configuration file.
-        *   If a parent directory exists AND the configuration file
+          * Read the configuration file.
+          * If a parent directory exists AND the configuration file
             allows inheritance:
-        *     Read the parent configuration by calling this function with the
+            * Read the parent configuration by calling this function with the
               parent directory as `node`.
-        *     Merge the parent configuration with the current one and
+            * Merge the parent configuration with the current one and
               cache it.
         * If the user has specified one of `BASE_ERROR_SELECTION_OPTIONS` in
           the CLI - return the CLI configuration with the configuration match
@@ -1087,7 +1087,7 @@ def _validate_options(cls, options):
     @classmethod
     def _has_exclusive_option(cls, options):
         """Return `True` iff one or more exclusive options were selected."""
-        return any([getattr(options, opt) for opt in
+        return any([getattr(options, opt) is not None for opt in
                     cls.BASE_ERROR_SELECTION_OPTIONS])
 
     @staticmethod
@@ -1096,13 +1096,13 @@ def _fix_set_options(options):
         optional_set_options = ('ignore', 'select')
         mandatory_set_options = ('add_ignore', 'add_select')
 
-        def _get_set(value):
-            """Split `value` by the delimiter `,` and return a set.
+        def _get_set(value_str):
+            """Split `value_str` by the delimiter `,` and return a set.
 
             Removes any occurrences of '' in the set.
 
             """
-            return set(value.split(',')) - set('')
+            return set(value_str.split(',')) - set([''])
 
         for opt in optional_set_options:
             value = getattr(options, opt)