rearrage directory structure

Author: James Graham

html5-tests.patch

@@ -10,7 +10,7 @@
 f = open("my_document.html")
 tree = html5lib.parse(f) 
 """
-__version__ = "%(version)s"
+__version__ = "0.95-dev"
 from html5parser import HTMLParser, parse, parseFragment
 from treebuilders import getTreeBuilder
 from treewalkers import getTreeWalker

html5lib/__init__.py

@@ -1 +1,12 @@
+import sys
+import os
+
+parent_path = os.path.abspath(os.path.join(os.path.split(__file__)[0], ".."))
+
+if not parent_path in sys.path:
+    sys.path.insert(0, parent_path)
+del parent_path
+
 from runtests import buildTestSuite
+
+import support

html5lib/tests/__init__.py

@@ -3,12 +3,6 @@
 import glob
 import unittest
 
-#Allow us to import the parent module
-os.chdir(os.path.split(os.path.abspath(__file__))[0])
-sys.path.insert(0, os.path.abspath(os.curdir))
-sys.path.insert(0, os.path.abspath(os.pardir))
-sys.path.insert(0, os.path.join(os.path.abspath(os.pardir), "src"))
-
 def buildTestSuite():
     suite = unittest.TestSuite()
     for testcase in glob.glob('test_*.py'):

html5lib/tests/runtests.py

@@ -2,20 +2,23 @@
 import sys
 import glob
 
-#Allow us to import the parent module
-os.chdir(os.path.split(os.path.abspath(__file__))[0])
-sys.path.insert(0, os.path.abspath(os.path.join(os.pardir, "src")))
-
 import html5lib
 from html5lib import html5parser, treebuilders
 
-#Define the location of the tests as this changes in release versions
-#RELEASE remove
-test_dir = os.path.join(os.path.pardir,os.path.pardir,'testdata')
-#END RELEASE
-#RELEASE add
-#test_dir = './testdata'
-#END RELEASE
+base_path = os.path.split(__file__)[0]
+if os.path.exists(os.path.join(base_path, 'testdata')):
+    #release
+    test_dir = os.path.join(base_path, 'testdata')
+else:
+    #development
+    test_dir = os.path.abspath(
+        os.path.join(base_path,
+                     os.path.pardir, os.path.pardir,
+                     os.path.pardir, 'testdata'))
+    assert os.path.exists(test_dir), "Test data not found"
+
+del base_path
+
 import simplejson
 
 #Build a dict of avaliable trees

html5lib/tests/support.py

@@ -32,6 +32,8 @@
 
 treeBuilderCache = {}
 
+import sys
+
 def getTreeBuilder(treeType, implementation=None, **kwargs):
     """Get a TreeBuilder class for various types of tree with built-in support
     

html5lib/treebuilders/__init__.py

@@ -1,20 +1,17 @@
-try:
-    from setuptools import setup
-except ImportError:
-    from distutils.core import setup
+from setuptools import setup
 import os
 
-long_description="""HTML parser designed to follow the HTML5 
+long_description="""HTML parser designed to follow the WHATWG HTML5 
 specification. The parser is designed to handle all flavours of HTML and 
 parses invalid documents using well-defined error handling rules compatible
 with the behaviour of major desktop web browsers.
 
 Output is to a tree structure; the current release supports output to
-DOM, ElementTree and lxml tree formats as well as a
+DOM, ElementTree, lxml and BeautifulSoup tree formats as well as a
 simple custom format"""
 
 classifiers=[
-    'Development Status :: %(status)s',
+    'Development Status :: 5 - Production/Stable',
     'Intended Audience :: Developers',
     'License :: OSI Approved :: MIT License',
     'Operating System :: OS Independent',
@@ -24,17 +21,19 @@
     ]
 
 setup(name='html5lib',
-      version='%(version)s',
+      version='0.95-dev',
       url='http://code.google.com/p/html5lib/',
       license="MIT License",
-      description='HTML parser based on the HTML5 specifcation',
+      description='HTML parser based on the WHAT-WG Web Applications 1.0' 
+                  '("HTML5") specifcation',
       long_description=long_description,
       classifiers=classifiers,
       maintainer='James Graham',
       maintainer_email='james@hoppipolla.co.uk',
       packages=['html5lib'] + ['html5lib.'+name
-          for name in os.listdir(os.path.join('src','html5lib'))
-          if os.path.isdir(os.path.join('src','html5lib',name)) and
+          for name in os.listdir(os.path.join('html5lib'))
+          if os.path.isdir(os.path.join('html5lib',name)) and
               not name.startswith('.')],
-      package_dir = {'html5lib': os.path.join('src', 'html5lib')},
+      test_suite = "html5lib.tests.buildTestSuite",
+      tests_require = ['simplejson']
       )