Fixes gak#114. A last minute changed broke the command line.

Author: gak

README.rst

@@ -69,4 +69,4 @@ A simple use of the API is::
 Documentation
 =============
 
-Feel free to browse the `documentation of pycallgraph <http://pycallgraph.slowchop.com/en/develop/>`_ for the `usage guide <http://pycallgraph.slowchop.com/en/develop/guide/index.html>`_ and `API reference <http://pycallgraph.slowchop.com/en/develop/api/api.html>`_.
+Feel free to browse the `documentation of pycallgraph <http://pycallgraph.slowchop.com/en/master/>`_ for the `usage guide <http://pycallgraph.slowchop.com/en/master/guide/index.html>`_ and `API reference <http://pycallgraph.slowchop.com/en/master/api/api.html>`_.

pycallgraph/output/output.py

@@ -24,8 +24,7 @@ def set_config(self, config):
         the output module config variables.
         '''
         for k, v in config.__dict__.iteritems():
-            is_fun = callable(getattr(self, k))
-            if hasattr(self, k) and is_fun:
+            if hasattr(self, k) and callable(getattr(self, k)):
                 continue
             setattr(self, k, v)
 

test/test_output.py

@@ -0,0 +1,6 @@
+from helpers import *
+
+
+def test_set_config():
+    '''Should not raise!'''
+    Output().set_config(Config())