patch the obidistutils extention to rely on setuptools.

distutils.ext/obidistutils/command/build_ext.py

@@ -104,8 +104,7 @@ try:
         
         sub_commands = [('build_files',has_files),
                         ('build_cexe', has_executables)
-                        ] + \
-                       ori_build_ext.sub_commands
+                        ] + ori_build_ext.sub_commands 
 
 except ImportError:
     from distutils.command import build_ext  # @UnusedImport

distutils.ext/obidistutils/core.py

@@ -9,12 +9,12 @@ import os.path
 import glob
 import sys
 
-# try:
-#     from setuptools.extension import Extension
-# except ImportError:
-#     from distutils.extension import Extension
+try:
+    from setuptools.extension import Extension
+except ImportError:
+    from distutils.extension import Extension
 
-from distutils.extension import Extension
+# from distutils.extension import Extension
 
 from obidistutils.serenity.checkpackage import  install_requirements,\
                                                 check_requirements, \

distutils.ext/obidistutils/dist.py

@@ -4,12 +4,12 @@ Created on 20 oct. 2012
 @author: coissac
 '''
 
-# try:
-#     from setuptools.dist import Distribution as ori_Distribution
-# except ImportError:
-#     from distutils.dist import Distribution as ori_Distribution
+try:
+    from setuptools.dist import Distribution as ori_Distribution
+except ImportError:
+    from distutils.dist import Distribution as ori_Distribution
 
-from distutils.dist import Distribution as ori_Distribution
+# from distutils.dist import Distribution as ori_Distribution
 
 class Distribution(ori_Distribution):
     

distutils.ext/obidistutils/serenity/__init__.py

@@ -81,9 +81,15 @@ def serenity_mode(package,version):
     argparser.add_argument('--serenity',
                            dest='serenity', 
                            action='store_true',
-                           default=False, 
+                           default=True, 
                            help='Switch the installer in serenity mode. Everythings are installed in a virtualenv')
 
+    argparser.add_argument('--no-serenity',
+                           dest='serenity', 
+                           action='store_false',
+                           default=True, 
+                           help='Switch the installer in the no serenity mode.')
+
     argparser.add_argument('--virtualenv',
                            dest='virtual', 
                            type=str,