From 6af9b928786a990b2161f54f89ca226a7c1028dc Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug.hellmann@dreamhost.com>
Date: Wed, 5 Dec 2012 19:22:14 -0500
Subject: [PATCH] Update datetypename() to work with DictType and ArrayType
 instances.

--HG--
extra : source : cef0a57e57255c4437922d3c2b0a81c84ad29b07
---
 tests/test_sphinxext.py | 19 +++++++++++++++++++
 wsme/sphinxext.py       |  5 +++++
 2 files changed, 24 insertions(+)

diff --git a/tests/test_sphinxext.py b/tests/test_sphinxext.py
index a86e11f..62d0ee1 100644
--- a/tests/test_sphinxext.py
+++ b/tests/test_sphinxext.py
@@ -3,6 +3,7 @@ import sphinx
 import os.path
 
 import wsme.types
+from wsme import sphinxext
 
 docpath = os.path.join(
     os.path.dirname(__file__),
@@ -24,3 +25,21 @@ class TestSphinxExt(unittest.TestCase):
             '-d', '.test_sphinxext/doctree',
             docpath,
             '.test_sphinxext/html']) == 0
+
+
+class TestDataTypeName(unittest.TestCase):
+    def test_user_type(self):
+        self.assertEqual(sphinxext.datatypename(ASampleType),
+                         'ASampleType')
+
+    def test_dict_type(self):
+        d = wsme.types.DictType(str, str)
+        self.assertEqual(sphinxext.datatypename(d), 'dict(str: str)')
+        d = wsme.types.DictType(str, ASampleType)
+        self.assertEqual(sphinxext.datatypename(d), 'dict(str: ASampleType)')
+
+    def test_array_type(self):
+        d = wsme.types.ArrayType(str)
+        self.assertEqual(sphinxext.datatypename(d), 'list(str)')
+        d = wsme.types.ArrayType(ASampleType)
+        self.assertEqual(sphinxext.datatypename(d), 'list(ASampleType)')
diff --git a/wsme/sphinxext.py b/wsme/sphinxext.py
index 5a97fb4..3f845d3 100644
--- a/wsme/sphinxext.py
+++ b/wsme/sphinxext.py
@@ -27,6 +27,11 @@ field_re = re.compile(r':(?P<field>\w+)(\s+(?P<name>\w+))?:')
 def datatypename(datatype):
     if isinstance(datatype, wsme.types.UserType):
         return datatype.name
+    if isinstance(datatype, wsme.types.DictType):
+        return 'dict(%s: %s)' % (datatypename(datatype.key_type),
+                                 datatypename(datatype.value_type))
+    if isinstance(datatype, wsme.types.ArrayType):
+        return 'list(%s)' % datatypename(datatype.item_type)
     return datatype.__name__