Updated setup.py to address recursive import problems now that pyparsing is part of 'packaging' (used by setuptools).

git-svn-id: svn://svn.code.sf.net/p/pyparsing/code/trunk@455 9bf210a0-9d2d-494c-87cf-cfb32e7dff7b

1 files changed, 7 insertions, 1 deletions

diff --git a/src/setup.py b/src/setup.py
index 82061c6..dbe2743 100644
--- a/src/setup.py
+++ b/src/setup.py
@@ -1,7 +1,13 @@
 #!/usr/bin/env python

 

 """Setup script for the pyparsing module distribution."""

-from setuptools import setup

+

+# Setuptools depends on pyparsing (via packaging) as of version 34, so allow

+# installing without it to avoid bootstrap problems.

+try:

+    from setuptools import setup

+except ImportError:

+    from distutils.core import setup

 

 import sys

 import os