Merge pull request #927 from pazz/cleanup

small fixes suggested by quantifiedcode

3 files changed, 2 insertions, 4 deletions

diff --git a/docs/source/api/conf.py b/docs/source/api/conf.py
index 0c36a73f..348a8b6e 100644
--- a/docs/source/api/conf.py
+++ b/docs/source/api/conf.py
@@ -26,7 +26,7 @@ class Mock(object):
         return Mock()
 
     @classmethod
-    def __getattr__(self, name):
+    def __getattr__(cls, name):
         return Mock() if name not in ('__file__', '__path__') else '/dev/null'
 
 MOCK_MODULES = ['notmuch', 'notmuch.globals',
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 2b544f23..a2751b70 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -16,7 +16,7 @@ class Mock(object):
         return Mock()
 
     @classmethod
-    def __getattr__(self, name):
+    def __getattr__(cls, name):
         return Mock() if name not in ('__file__', '__path__') else '/dev/null'
 
 class MockModule(object):
diff --git a/extra/theme_convert.py b/extra/theme_convert.py
index 20113be0..9a70a1cc 100755
--- a/extra/theme_convert.py
+++ b/extra/theme_convert.py
@@ -51,8 +51,6 @@ if __name__ == "__main__":
             values.append(get_leaf_value(old, [c] + path + ['fg']) or 'default')
             values.append(get_leaf_value(old, [c] + path + ['bg']) or 'default')
         return values
-        values = map(lambda s: '\'' + s + '\'', values)
-        return ','.join(values)
 
     for bmode in ['global', 'help', 'envelope']:
         new[bmode] = {}