jinja2-main / files

     1.1 --- a/.hgtags	Sun Sep 13 00:25:11 2009 -0700
     1.2 +++ b/.hgtags	Sun Sep 13 00:30:06 2009 -0700
     1.3 @@ -2,4 +2,3 @@
     1.4  15618ea34a6bc6c5e23ae89976d60b412a52a960 2.0
     1.5  dbf1e3a0b178c984c5bffa724b395e705709fd74 2.1
     1.6  744e087d24e9424193ff2640c2f5a0256116d9d2 2.1.1
     1.7 -41c2aca50afd8f0bbd537ed026d6a13be737ce8d 2.2

     2.1 --- a/docs/intro.rst	Sun Sep 13 00:25:11 2009 -0700
     2.2 +++ b/docs/intro.rst	Sun Sep 13 00:30:06 2009 -0700
     2.3 @@ -38,13 +38,14 @@
     2.4  should be installed.
     2.5  
     2.6  If you don't have a working C compiler and you are trying to install the source
     2.7 -release you will get a compiler error.  This however can be circumvented by
     2.8 -passing the ``--without-speedups`` command line argument to the setup script::
     2.9 +release with the speedups you will get a compiler error.  This however can be
    2.10 +circumvented by passing the ``--without-speedups`` command line argument to the
    2.11 +setup script::
    2.12  
    2.13 -    $ python setup.py install --without-speedups
    2.14 +    $ python setup.py install --with-speedups
    2.15  
    2.16 -For more details about that have a look at the :ref:`disable-speedups`
    2.17 -section below.
    2.18 +(As of Jinja 2.2, the speedups are disabled by default and can be enabled
    2.19 +with ``--with-speedups``.  See :ref:`enable-speedups`)
    2.20  
    2.21  .. _ctypes: http://python.net/crew/theller/ctypes/
    2.22  
    2.23 @@ -109,23 +110,23 @@
    2.24  .. _pip: http://pypi.python.org/pypi/pip
    2.25  .. _mercurial: http://www.selenic.com/mercurial/
    2.26  
    2.27 -.. _disable-speedups:
    2.28 +.. _enable-speedups:
    2.29  
    2.30 -Disable the speedups Module
    2.31 +Enaable the speedups Module
    2.32  ~~~~~~~~~~~~~~~~~~~~~~~~~~~
    2.33  
    2.34 -By default Jinja2 will try to compile the speedups module.  This of course
    2.35 +By default Jinja2 will not compile the speedups module.  Enabling this
    2.36  will fail if you don't have the Python headers or a working compiler.  This
    2.37  is often the case if you are installing Jinja2 from a windows machine.
    2.38  
    2.39 -You can disable the speedups extension when installing using the
    2.40 -``--without-speedups`` flag::
    2.41 +You can enable the speedups extension when installing using the
    2.42 +``--with-speedups`` flag::
    2.43  
    2.44 -    sudo python setup.py install --without-speedups
    2.45 +    sudo python setup.py install --with-speedups
    2.46  
    2.47  You can also pass this parameter to `pip`::
    2.48  
    2.49 -    $ pip install --install-option='--without-speedups' Jinja2
    2.50 +    $ pip install --install-option='--with-speedups' Jinja2
    2.51  
    2.52  
    2.53  Basic API Usage

     3.1 --- a/setup.py	Sun Sep 13 00:25:11 2009 -0700
     3.2 +++ b/setup.py	Sun Sep 13 00:30:06 2009 -0700
     3.3 @@ -71,10 +71,9 @@
     3.4          'Topic :: Text Processing :: Markup :: HTML'
     3.5      ],
     3.6      packages=['jinja2'],
     3.7 -    data_files=data_files,
     3.8      features={
     3.9          'speedups': Feature("optional C speed-enhancements",
    3.10 -            standard=True,
    3.11 +            standard=False,
    3.12              ext_modules=[
    3.13                  Extension('jinja2._speedups', ['jinja2/_speedups.c'])
    3.14              ]