replace with -> with_ in build/ctools (a reserved word in Python 2.6)

[davidf@…]

In bitten/build/ctools.py, with is used as an argument to the configure method. This generates warnings on Python 2.5:

bitten/build/ctools.py:26: Warning: 'with' will become a reserved keyword in Python 2.6
bitten/build/ctools.py:45: Warning: 'with' will become a reserved keyword in Python 2.6
bitten/build/ctools.py:48: Warning: 'with' will become a reserved keyword in Python 2.6

It would be best to replace this sooner than later to prevent people writing scripts which wil have to change.

[davidf@…]

Patch that adds a with_ argument to configure, and warns of the deprecation of the with argument

[mgood]

We shouldn't require users to change anything in their build recipes. This patch eliminates using "with" as a parameter name and should provide both backwards and forwards compatibility. I'll try to write up some unit tests for this, but I think this should work:

bitten/build/ctools.py

@@ -22 +22 @@
 
 __docformat__ = 'restructuredtext en'
 
-def configure(ctxt, file_='configure', enable=None, disable=None, with=None,
-              without=None, cflags=None, cxxflags=None):
+def configure(ctxt, file_='configure', enable=None, disable=None, with_=None,
+              without=None, cflags=None, cxxflags=None, **kw):
     """Run a ``configure`` script.
     
     :param ctxt: the build context
@@ -31 +31 @@
     :param file\_: name of the configure script
     :param enable: names of the features to enable, seperated by spaces
     :param disable: names of the features to disable, separated by spaces
-    :param with: names of external packages to include
+    :param with_: names of external packages to include
     :param without: names of external packages to exclude
     :param cflags: ``CFLAGS`` to pass to the configure script
     :param cxxflags: ``CXXFLAGS`` to pass to the configure script
@@ -41 +41 @@
         args += ['--enable-%s' % feature for feature in enable.split()]
     if disable:
         args += ['--disable-%s' % feature for feature in disable.split()]
-    if with:
-        for pkg in with.split():
+    with_ = kw.pop('with', with_)
+    for key in kw:
+        raise TypeError("configure() got an unexpected keyword argument '%s'" % key)
+    if with_:
+        for pkg in with_.split():
             pkg_path = pkg + '.path'
             if pkg_path in ctxt.config:
                 args.append('--with-%s=%s' % (pkg, ctxt.config[pkg_path]))

[thomas.moschny@…]

Release of the first distributions having Python 2.6 is imminent, so can we apply this patch please?

[dfraser]

#362 was reported as a duplicate of this

[dfraser]

r581 should fix this