Merge pull request #3107 from choffmann/fix-issue-3106

tacaswell · tacaswell · commit 1ecafbbe6af1 · 2014-06-02T17:15:42.000-04:00
Bug-fix for issue 3106
diff --git a/lib/matplotlib/docstring.py b/lib/matplotlib/docstring.py
@@ -87,7 +87,7 @@ def __init__(self, addendum, join=''):
 
     def __call__(self, func):
         docitems = [func.__doc__, self.addendum]
-        func.__doc__ = func.__doc__ and ''.join(docitems)
+        func.__doc__ = func.__doc__ and self.join.join(docitems)
         return func
 
 
