[FE-CVS] r3102 - in FormEncode/trunk: . docs

[<sub...@co...>]

Author: ianb
Date: 2007-10-20 18:23:37 -0600 (Sat, 20 Oct 2007)
New Revision: 3102

Modified:
   FormEncode/trunk/docs/news.txt
   FormEncode/trunk/setup.py
Log:
Make use_setuptools optional in setup.py

Modified: FormEncode/trunk/docs/news.txt
===================================================================
--- FormEncode/trunk/docs/news.txt	2007-10-21 00:22:19 UTC (rev 3101)
+++ FormEncode/trunk/docs/news.txt	2007-10-21 00:23:37 UTC (rev 3102)
@@ -43,6 +43,9 @@
 * Make ``validators.DateConverter`` serialize dates properly (from
   James Gardner).
 
+* Minor fix to setup.py to make FormEncode more friendly with
+  zc.buildout.
+
 0.7.1
 -----
 

Modified: FormEncode/trunk/setup.py
===================================================================
--- FormEncode/trunk/setup.py	2007-10-21 00:22:19 UTC (rev 3101)
+++ FormEncode/trunk/setup.py	2007-10-21 00:23:37 UTC (rev 3102)
@@ -1,6 +1,9 @@
-from ez_setup import use_setuptools
-use_setuptools()
-from setuptools import setup
+try:
+    from setuptools import setup
+except ImportError:
+    from ez_setup import use_setuptools
+    use_setuptools()
+    from setuptools import setup
 
 version = '0.7.2'