Some cleanup for 0.10

jgraham · jgraham · commit 15eebd3ca7ca · 2007-10-03T20:56:55.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%401025
diff --git a/src/html5lib/filters/formfiller.py b/src/html5lib/filters/formfiller.py
@@ -70,7 +70,7 @@ def __iter__(self):
 
                 elif name == "select":
                     field_type = "select"
-                    attributes = dict(reversed(token["data"]))
+                    attributes = dict(token["data"][::-1])
                     field_name = attributes.get("name")
                     is_select_multiple = "multiple" in attributes
                     is_selected_option_found = False
diff --git a/tests/runtests.py b/tests/runtests.py
@@ -7,7 +7,7 @@
 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()
@@ -18,7 +18,9 @@ def buildTestSuite():
 
 def main():
     results = unittest.TextTestRunner().run(buildTestSuite())
-    if not results.wasSuccessful(): sys.exit(1)
+    return results
 
 if __name__ == "__main__":
-    main()
+    results = main()
+    if not results.wasSuccessful():
+        sys.exit(1)
diff --git a/tests/test_encoding.py b/tests/test_encoding.py
@@ -23,7 +23,7 @@ def encodingTest(self, data=test['data'], encoding=test['encoding']):
     try:
         import chardet
         def test_chardet(self):
-            data = open(os.path.join(test_dir, "/chardet/test_big5.txt")).read()
+            data = open(os.path.join(test_dir, "encoding" , "chardet", "test_big5.txt")).read()
             encoding = inputstream.HTMLInputStream(data).charEncoding
             assert encoding.lower() == "big5"
         setattr(Html5EncodingTestCase, 'test_chardet', test_chardet)
diff --git a/utils/package.py b/utils/package.py
@@ -7,10 +7,11 @@
 import subprocess
 import zipfile
 
-exclude = [".svn", "*.pyc", "*~", "__basedir__/utils",
+exclude = [".svn", "*.pyc", "*~", "*.orig", "*.patch", "__basedir__/utils",
            "__basedir__/setup_base.py", "*.prof", "#*", "__basedir__/build",
            '__basedir__/tests/performance', '*.out',
-           '__basedir__/tests/sites', '__basedir__/tests/*.html']
+           '__basedir__/tests/testdata/*.html',
+           '__basedir__/tests/testdata/sites', '__basedir__/print-stats.py']
 
 class Package(object):
 
