switch from attribute "type" to "doctype"

tests/example.py

@@ -2,11 +2,7 @@
 from __future__ import absolute_import, division, print_function
 
 import os
-
-try:
-    from types import SimpleNamespace
-except ImportError:
-    from utils import SimpleNamespace
+from argparse import Namespace
 
 import tldp.doctypes
 
@@ -17,49 +13,49 @@ opd = os.path.dirname
 opa = os.path.abspath
 sampledocs = opa(opj(opd(__file__), 'sample-documents'))
 
-ex_linuxdoc = SimpleNamespace(
-               type=tldp.doctypes.linuxdoc.Linuxdoc,
+ex_linuxdoc = Namespace(
+               doctype=tldp.doctypes.linuxdoc.Linuxdoc,
                filename=opj(sampledocs, 'linuxdoc-simple.sgml'),
               )
 
-ex_docbooksgml = SimpleNamespace(
-                  type=tldp.doctypes.docbooksgml.DocbookSGML,
+ex_docbooksgml = Namespace(
+                  doctype=tldp.doctypes.docbooksgml.DocbookSGML,
                   filename=opj(sampledocs, 'docbooksgml-simple.sgml'),
                  )
 
-ex_docbook4xml = SimpleNamespace(
-                 type=tldp.doctypes.docbook4xml.Docbook4XML,
+ex_docbook4xml = Namespace(
+                 doctype=tldp.doctypes.docbook4xml.Docbook4XML,
                  filename=opj(sampledocs, 'docbook4xml-simple.xml'),
                 )
 
-ex_docbook5xml = SimpleNamespace(
-                 type=tldp.doctypes.docbook5xml.Docbook5XML,
+ex_docbook5xml = Namespace(
+                 doctype=tldp.doctypes.docbook5xml.Docbook5XML,
                  filename=opj(sampledocs, 'docbook5xml-simple.xml'),
                 )
 
-# ex_rst = SimpleNamespace(
-#           type=tldp.doctypes.rst.RestructuredText,
+# ex_rst = Namespace(
+#           doctype=tldp.doctypes.rst.RestructuredText,
 #           filename=opj(sampledocs, 'restructuredtext-simple.rst'),
 #          )
 #
-# ex_text = SimpleNamespace(
-#            type=tldp.doctypes.text.Text,
+# ex_text = Namespace(
+#            doctype=tldp.doctypes.text.Text,
 #            filename=opj(sampledocs, 'text-simple.txt'),
 #           )
 #
-# ex_markdown = SimpleNamespace(
-#                type=tldp.doctypes.markdown.Markdown,
+# ex_markdown = Namespace(
+#                doctype=tldp.doctypes.markdown.Markdown,
 #                filename=opj(sampledocs, 'markdown-simple.md'),
 #               )
 
-ex_linuxdoc_dir = SimpleNamespace(
-               type=tldp.doctypes.linuxdoc.Linuxdoc,
+ex_linuxdoc_dir = Namespace(
+               doctype=tldp.doctypes.linuxdoc.Linuxdoc,
                filename=opj(sampledocs, 'Linuxdoc-Larger',
                             'Linuxdoc-Larger.sgml'),
               )
 
-ex_docbook4xml_dir = SimpleNamespace(
-               type=tldp.doctypes.docbook4xml.Docbook4XML,
+ex_docbook4xml_dir = Namespace(
+               doctype=tldp.doctypes.docbook4xml.Docbook4XML,
                filename=opj(sampledocs, 'DocBook-4.2-WHYNOT',
                             'DocBook-4.2-WHYNOT.xml'),
               )

tests/test_sources.py

@@ -5,14 +5,10 @@ import os
 import errno
 import random
 import unittest
+from argparse import Namespace
 
 from cStringIO import StringIO
 
-try:
-    from types import SimpleNamespace
-except ImportError:
-    from utils import SimpleNamespace
-
 from tldptesttools import TestToolsFilesystem
 
 # -- Test Data
@@ -24,15 +20,15 @@ from tldp.sources import scansourcedirs, sourcedoc_fromdir
 
 sampledocs = os.path.join(os.path.dirname(__file__), 'sample-documents')
 
-widths = SimpleNamespace(status=20, stem=50)
+widths = Namespace(status=20, stem=50)
 
 
 class TestFileSourceCollectionMultiDir(TestToolsFilesystem):
 
     def test_multidir_finding_singlefiles(self):
         ex = random.choice(example.sources)
-        doc0 = SimpleNamespace(reldir='LDP/howto', stem="A-Unique-Stem")
-        doc1 = SimpleNamespace(reldir='LDP/guide', stem="A-Different-Stem")
+        doc0 = Namespace(reldir='LDP/howto', stem="A-Unique-Stem")
+        doc1 = Namespace(reldir='LDP/guide', stem="A-Different-Stem")
         documents = (doc0, doc1)
         for d in documents:
             d.reldir, d.absdir = self.adddir(d.reldir)
@@ -45,8 +41,8 @@ class TestFileSourceCollectionMultiDir(TestToolsFilesystem):
 
     def test_multidir_finding_namecollision(self):
         ex = random.choice(example.sources)
-        doc0 = SimpleNamespace(reldir='LDP/howto', stem="A-Non-Unique-Stem")
-        doc1 = SimpleNamespace(reldir='LDP/guide', stem="A-Non-Unique-Stem")
+        doc0 = Namespace(reldir='LDP/howto', stem="A-Non-Unique-Stem")
+        doc1 = Namespace(reldir='LDP/guide', stem="A-Non-Unique-Stem")
         documents = (doc0, doc1)
         for d in documents:
             d.reldir, d.absdir = self.adddir(d.reldir)

tests/test_typeguesser.py

@@ -27,15 +27,15 @@ class TestDoctypes(unittest.TestCase):
 
     def testDetectionBySignature(self):
         for ex in example.sources:
-            if isinstance(ex.type, SignatureChecker):
+            if isinstance(ex.doctype, SignatureChecker):
                 dt = genericGuessTest(ex.content, ex['ext'])
-                self.assertEqual(ex.type, dt)
+                self.assertEqual(ex.doctype, dt)
 
     def testDetectionByExtension(self):
         for ex in example.sources:
-            if not isinstance(ex.type, SignatureChecker):
+            if not isinstance(ex.doctype, SignatureChecker):
                 dt = genericGuessTest(ex.content, ex.ext)
-                self.assertEqual(ex.type, dt)
+                self.assertEqual(ex.doctype, dt)
 
     def testDetectionBogusExtension(self):
         dt = genericGuessTest('franks-cheese-shop', '.wmix')
@@ -55,10 +55,10 @@ class TestDoctypes(unittest.TestCase):
     def testGuessTooManyMatches(self):
         a = example.ex_docbook4xml.content
         b = example.ex_docbook5xml.content
-        four, fourdt = a + b, example.ex_docbook4xml.type
+        four, fourdt = a + b, example.ex_docbook4xml.doctype
         dt = genericGuessTest(four, '.xml')
         self.assertIs(dt, fourdt)
-        five, fivedt = b + a, example.ex_docbook5xml.type
+        five, fivedt = b + a, example.ex_docbook5xml.doctype
         dt = genericGuessTest(five, '.xml')
         self.assertIs(dt, fivedt)