Merge branch 'release/1.0.1'

Author: gak

README.rst

@@ -27,7 +27,7 @@ Click on the images below to see a larger version and the source code that gener
 Project Status
 ==============
 
-The latest version is **1.0.0** which was released on 2013-09-17, and is a backwards incompatbile from the previous release.
+The latest version is **1.0.1** which was released on 2013-09-17, and is a backwards incompatbile from the previous release.
 
 The `project lives on GitHub <https://github.com/gak/pycallgraph/#python-call-graph>`_, where you can `report issues <https://github.com/gak/pycallgraph/issues>`_, contribute to the project by `forking the project <https://help.github.com/articles/fork-a-repo>`_ then creating a `pull request <https://help.github.com/articles/using-pull-requests>`_, or just `browse the source code <https://github.com/gak/pycallgraph/>`_.
 
@@ -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>`_.

docs/index.rst

@@ -27,7 +27,7 @@ Click on the images below to see a larger version and the source code that gener
 Project Status
 ==============
 
-The latest version is **1.0.0** which was released on 2013-09-17, and is a backwards incompatbile from the previous release.
+The latest version is **1.0.1** which was released on 2013-09-17, and is a backwards incompatbile from the previous release.
 
 The `project lives on GitHub <https://github.com/gak/pycallgraph/#python-call-graph>`_, where you can `report issues <https://github.com/gak/pycallgraph/issues>`_, contribute to the project by `forking the project <https://help.github.com/articles/fork-a-repo>`_ then creating a `pull request <https://help.github.com/articles/using-pull-requests>`_, or just `browse the source code <https://github.com/gak/pycallgraph/>`_.
 

docs/readme_extras.rst

@@ -1,4 +1,4 @@
 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>`_.

man/pycallgraph.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "PYCALLGRAPH" "1" "September 17, 2013" "1.0.0" "Python Call Graph"
+.TH "PYCALLGRAPH" "1" "September 17, 2013" "1.0.1" "Python Call Graph"
 .SH NAME
 pycallgraph \- Python Call Graph
 .

pycallgraph/metadata.py

@@ -1,6 +1,6 @@
 # A different file to pycallgraph.py because of circular import problem
 
-__version__ = '1.0.0'
+__version__ = '1.0.1'
 __copyright__ = 'Copyright Gerald Kaszuba 2007-2013'
 __license__ = 'GPLv2'
 __author__ = 'Gerald Kaszuba'

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())