Merge pull request #1 from mdboom/unicode-docstrings

Unicode docstrings are not handled correctly on Python 2.x

Author: certik

numpydoc/numpydoc.py

@@ -50,7 +50,7 @@ def mangle_docstrings(app, what, name, obj, options, lines,
         if sys.version_info[0] >= 3:
             doc = str(doc)
         else:
-            doc = str(doc).decode('utf-8')
+            doc = unicode(doc)
         lines[:] = doc.split(sixu("\n"))
 
     if app.config.numpydoc_edit_link and hasattr(obj, '__name__') and \
@@ -182,4 +182,3 @@ def run(self):
             return base_directive.run(self)
 
     return directive
-