--- a/setup.py	Fri Jan 24 05:51:12 2014 +0100
+++ b/setup.py	Thu Mar 13 16:10:15 2014 +0100
@@ -35,6 +35,7 @@
     author_email=AUTHOR_EMAIL,
     packages=['svgwrite', 'svgwrite/data'],
     provides=['svgwrite'],
+    requires=['pyparsing'],
     script_args=args,
     long_description=read('README.TXT')+read('NEWS.TXT'),
     platforms="OS Independent",
--- a/svgwrite/data/svgparser.py Fri Jan 24 05:51:12 2014 +0100
+++ b/svgwrite/data/svgparser.py Thu Mar 13 16:10:15 2014 +0100
@@ -10,12 +10,8 @@
 __all__ = ["is_valid_transferlist", "is_valid_pathdata", "is_valid_animation_timing"]

 import sys
-PYTHON3 = sys.version_info[0] > 2
-if PYTHON3:
-    from svgwrite.data.pyparsing_py3 import *
-else:
-    from svgwrite.data.pyparsing_py2 import *

+from pyparsing import *
 from functools import partial

 event_names = [
--- a/tests/test_clock_val_parser.py	Thu Mar 13 16:10:15 2014 +0100
+++ b/tests/test_clock_val_parser.py	Fri Mar 14 00:07:38 2014 +0100
@@ -8,13 +8,7 @@
 
 import sys
 import unittest
-
-PYTHON3 = sys.version_info[0] > 2
-
-if PYTHON3:
-    import svgwrite.data.pyparsing_py3 as pp
-else:
-    import svgwrite.data.pyparsing_py2 as pp
+import pyparsing as pp
 
 from svgwrite.data.svgparser import build_clock_val_parser
 from svgwrite.data.svgparser import build_wall_clock_val_parser
--- a/tests/test_parsing_basic_types.py	Thu Mar 13 16:10:15 2014 +0100
+++ b/tests/test_parsing_basic_types.py	Fri Mar 14 00:07:38 2014 +0100
@@ -8,12 +8,7 @@
 
 import sys
 import unittest
-PYTHON3 = sys.version_info[0] > 2
-
-if PYTHON3:
-    import svgwrite.data.pyparsing_py3 as pp
-else:
-    import svgwrite.data.pyparsing_py2 as pp
+import pyparsing as pp
 
 from svgwrite.data.svgparser import exponent, fractional_constant, \
      scientific_constant, number