remove second disable= and combine

Author: jettero

pylintrc

@@ -125,15 +125,25 @@ disable=print-statement,
         xreadlines-attribute,
         deprecated-sys-function,
         exception-escape,
-        comprehension-escape
+        comprehension-escape,
+        missing-module-docstring
+
+# missing-module-docstring^^:
+#   This wants to require a docstring at the top of every file.  We don't
+#   always want that; particularly for __init__.py files.  If there was a way
+#   to disable this for only __init__.py files, that would be better. Some of
+#   our __init__.py files are are auto-generated (e.g., for versioning). Until
+#   we find a way to do that without a comment in the file (which is roughly
+#   the same as a docstring), just disable this check.
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option
 # multiple time (only on the command line, not in the configuration file where
 # it should appear only once). See also the "--disable" option for examples.
 enable=blacklisted-name,
        invalid-name,
-       missing-docstring,
+       missing-function-docstring,
+       missing-class-docstring,
        empty-docstring,
        unneeded-not,
        singleton-comparison,
@@ -373,14 +383,6 @@ enable=blacklisted-name,
        bad-thread-instantiation,
        shallow-copy-environ
 
-# This wants to require a docstring at the top of every file.  We don't always
-# want that; particularly for __init__.py files.  If there was a way to disable
-# this for only __init__.py files, that would be better as some of ours are
-# auto-generated.  Until we find a way to to that without a comment in the file
-# (which is roughly the same as a docstring), we'll do this:
-disable=missing-module-docstring
-
-
 [REPORTS]
 
 # Python expression which should return a note less than 10 (10 is the highest