from setuptools import setup
import os

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, lxml and BeautifulSoup tree formats as well as a
simple custom format"""

classifiers=[
    'Development Status :: 5 - Production/Stable',
    'Intended Audience :: Developers',
    'License :: OSI Approved :: MIT License',
    'Operating System :: OS Independent',
    'Programming Language :: Python',
    'Topic :: Software Development :: Libraries :: Python Modules',
    'Topic :: Text Processing :: Markup :: HTML'
    ]

setup(name='html5lib',
      version='0.95',
      url='http://code.google.com/p/html5lib/',
      license="MIT License",
      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('html5lib'))
          if os.path.isdir(os.path.join('html5lib',name)) and
              not name.startswith('.')],
      install_requires=['six']
      )

@@ -2,18 +2,22 @@
 rom 
-setuptools
+distutils.core
  imp
@@ -103,18 +103,16 @@
 TWG HTML
-5 
 %0Aspecifi
@@ -693,24 +693,110 @@
 :: Python',%0A
+    'Programming Language :: Python :: 2',%0A    'Programming Language :: Python :: 3',%0A
     'Topic :
@@ -949,12 +949,13 @@
 on='
-0.95
+1.0b1
 ',%0A 
@@ -972,29 +972,23 @@
 http
+s
 ://
-code.google
+github
 .com/
-p/
 html
@@ -992,16 +992,31 @@
 tml5lib/
+html5lib-python
 ',%0A     
@@ -1091,63 +1091,15 @@
 WHAT
--
 WG 
-Web Applications 1.0' %0A                  '(%22
 HTML
-5%22)
  spe
@@ -1476,40 +1476,8 @@
 .')%5D
-,%0A      install_requires=%5B'six'%5D
 %0A   

Update setup.py