(bringing this onto the mailing list)
On Tue, Jun 09, 2009 at 10:26:54AM +0200, Arnaud Fontaine wrote:
> Hi,
>
> I have almost finish packaging the last version of Cheetah, however I
> have some minor issues:
>
> 1/ I have attached to this email a patch which remove useless shebang,
> could you please consider applying it?
I applied the majority of the patch (except the markdown bits), you
might consider forking the project on GitHub for minor patches like this
(the collaboration between the Git repos on GH is pretty stellar)
http://github.com/rtyler/cheetah/tree/master> 2/ I have noticed that you have included Markdown module into the source
> (src/contrib/markdown/__init__.py), however this is generally not a
> good idea to do so because of security bugs it may introduced for
> example. So could it be possible to add a dependency (maybe using
> setuptools) instead and consequently remove the markdown from the
> cheetah source?
This sounds like a good idea to me.
Both of these changes have been committed to the 'next' branch, and are
scheduled to go out with the v2.2.2 release. I you'd like, I can
cherry-pick these particular changes over to the 'maint' branch to
release a v2.2.1.1 release for packaging? How would you like to do this?
Cheers
>
> Cheers,
> Arnaud
>
> diff -urN src/CheetahWrapper.py.old src/CheetahWrapper.py
> --- src/CheetahWrapper.py.old 2006-02-04 01:59:46.000000000 +0100
> +++ src/CheetahWrapper.py 2006-08-21 12:51:56.000000000 +0200
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python
> # $Id: CheetahWrapper.py,v 1.26 2007/10/02 01:22:04 tavis_rudd Exp $
> """Cheetah command-line interface.
>
> diff -urN src/ErrorCatchers.py src/ErrorCatchers.py
> --- src/ErrorCatchers.py.old 2005-01-03 20:59:07.000000000 +0100
> +++ src/ErrorCatchers.py 2006-08-21 12:52:04.000000000 +0200
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python
> # $Id: ErrorCatchers.py,v 1.7 2005/01/03 19:59:07 tavis_rudd Exp $
> """ErrorCatcher class for Cheetah Templates
>
> diff -urN src/FileUtils.py src/FileUtils.py
> --- src/FileUtils.py.old 2005-11-02 23:26:07.000000000 +0100
> +++ src/FileUtils.py 2006-08-21 12:52:06.000000000 +0200
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python
> # $Id: FileUtils.py,v 1.12 2005/11/02 22:26:07 tavis_rudd Exp $
> """File utitilies for Python:
>
> diff -urN src/ImportHooks.py src/ImportHooks.py
> --- src/ImportHooks.py.old 2006-06-20 21:23:27.000000000 +0200
> +++ src/ImportHooks.py 2006-08-21 12:52:09.000000000 +0200
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python
> # $Id: ImportHooks.py,v 1.27 2007/11/16 18:28:47 tavis_rudd Exp $
>
> """Provides some import hooks to allow Cheetah's .tmpl files to be imported
> diff -urN src/ImportManager.py src/ImportManager.py
> --- src/ImportManager.py.old 2006-01-27 20:00:20.000000000 +0100
> +++ src/ImportManager.py 2006-08-21 12:52:12.000000000 +0200
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python
> # $Id: ImportManager.py,v 1.6 2007/04/03 01:56:24 tavis_rudd Exp $
>
> """Provides an emulator/replacement for Python's standard import system.
> diff -urN src/SourceReader.py src/SourceReader.py
> --- src/SourceReader.py.old 2006-02-05 03:10:30.000000000 +0100
> +++ src/SourceReader.py 2006-08-21 12:52:33.000000000 +0200
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python
> # $Id: SourceReader.py,v 1.15 2007/04/03 01:57:42 tavis_rudd Exp $
> """SourceReader class for Cheetah's Parser and CodeGenerator
>
> diff -urN src/TemplateCmdLineIface.py src/TemplateCmdLineIface.py
> --- src/TemplateCmdLineIface.py.old 2006-01-10 21:34:35.000000000 +0100
> +++ src/TemplateCmdLineIface.py 2006-08-21 12:52:36.000000000 +0200
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python
> # $Id: TemplateCmdLineIface.py,v 1.13 2006/01/10 20:34:35 tavis_rudd Exp $
>
> """Provides a command line interface to compiled Cheetah template modules.
> diff -urN src/Templates/SkeletonPage.py src/Templates/SkeletonPage.py
> --- src/Templates/SkeletonPage.py.old 2006-02-05 03:52:34.000000000 +0100
> +++ src/Templates/SkeletonPage.py 2006-08-21 12:52:42.000000000 +0200
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python
>
>
> """A Skeleton HTML page template, that provides basic structure and utility methods.
> diff -urN src/Templates/_SkeletonPage.py src/Templates/_SkeletonPage.py
> --- src/Templates/_SkeletonPage.py.old 2006-01-07 08:18:28.000000000 +0100
> +++ src/Templates/_SkeletonPage.py 2006-08-21 12:52:49.000000000 +0200
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python
> # $Id: _SkeletonPage.py,v 1.13 2002/10/01 17:52:02 tavis_rudd Exp $
> """A baseclass for the SkeletonPage template
>
> diff -urN src/Templates/__init__.py src/Templates/__init__.py
> --- src/Templates/__init__.py.old 2001-06-13 05:50:40.000000000 +0200
> +++ src/Templates/__init__.py 2006-08-21 12:52:52.000000000 +0200
> @@ -1 +1 @@
> -#!/usr/bin/env python
> +
> diff -urN src/Tools/CGITemplate.py src/Tools/CGITemplate.py
> --- src/Tools/CGITemplate.py.old 2006-01-29 03:09:59.000000000 +0100
> +++ src/Tools/CGITemplate.py 2006-08-21 12:53:26.000000000 +0200
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python
> # $Id: CGITemplate.py,v 1.6 2006/01/29 02:09:59 tavis_rudd Exp $
> """A subclass of Cheetah.Template for use in CGI scripts.
>
> diff -urN src/Tools/MondoReport.py src/Tools/MondoReport.py
> --- src/Tools/MondoReport.py.old 2005-01-02 19:47:42.000000000 +0100
> +++ src/Tools/MondoReport.py 2006-08-21 12:53:31.000000000 +0200
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python
> """
> @@TR: This code is pretty much unsupported.
>
> diff -urN src/Tools/SiteHierarchy.py src/Tools/SiteHierarchy.py
> --- src/Tools/SiteHierarchy.py.old 2001-10-11 05:25:54.000000000 +0200
> +++ src/Tools/SiteHierarchy.py 2006-08-21 12:53:39.000000000 +0200
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python
> # $Id: SiteHierarchy.py,v 1.1 2001/10/11 03:25:54 tavis_rudd Exp $
> """Create menus and crumbs from a site hierarchy.
>
> diff -urN src/Utils/Indenter.py src/Utils/Indenter.py
> --- src/Utils/Indenter.py.old 2006-01-08 02:09:30.000000000 +0100
> +++ src/Utils/Indenter.py 2006-08-21 12:53:48.000000000 +0200
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python
> # $Id: Indenter.py,v 1.7 2006/01/08 01:09:30 tavis_rudd Exp $
> """Indentation maker.
> @@TR: this code is unsupported and largely undocumented ...
> diff -urN src/Utils/Misc.py src/Utils/Misc.py
> --- src/Utils/Misc.py.old 2005-11-02 23:26:08.000000000 +0100
> +++ src/Utils/Misc.py 2006-08-21 12:53:52.000000000 +0200
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python
> # $Id: Misc.py,v 1.8 2005/11/02 22:26:08 tavis_rudd Exp $
> """Miscellaneous functions/objects used by Cheetah but also useful standalone.
>
> diff -urN src/Utils/VerifyType.py src/Utils/VerifyType.py
> --- src/Utils/VerifyType.py.old 2005-11-02 23:26:08.000000000 +0100
> +++ src/Utils/VerifyType.py 2006-08-21 12:53:57.000000000 +0200
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python
> # $Id: VerifyType.py,v 1.4 2005/11/02 22:26:08 tavis_rudd Exp $
> """Functions to verify an argument's type
>
> diff -urN src/Utils/WebInputMixin.py src/Utils/WebInputMixin.py
> --- src/Utils/WebInputMixin.py.old 2006-01-06 22:56:54.000000000 +0100
> +++ src/Utils/WebInputMixin.py 2006-08-21 12:54:00.000000000 +0200
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python
> # $Id: WebInputMixin.py,v 1.10 2006/01/06 21:56:54 tavis_rudd Exp $
> """Provides helpers for Template.webInput(), a method for importing web
> transaction variables in bulk. See the docstring of webInput for full details.
> diff -urN src/Utils/memcache.py src/Utils/memcache.py
> --- src/Utils/memcache.py.old 2006-01-28 04:18:45.000000000 +0100
> +++ src/Utils/memcache.py 2006-08-21 12:54:09.000000000 +0200
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python
>
> """
> client module for memcached (memory cache daemon)
> --- src/Compiler.py.old 2009-06-09 14:01:43.000000000 +0900
> +++ src/Compiler.py 2009-06-09 14:04:54.000000000 +0900
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python
> '''
> Compiler classes for Cheetah:
> ModuleCompiler aka 'Compiler'
> --- src/DummyTransaction.py.old 2009-06-09 14:01:57.000000000 +0900
> +++ src/DummyTransaction.py 2009-06-09 14:04:54.000000000 +0900
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python
>
> '''
> Provides dummy Transaction and Response classes is used by Cheetah in place
> --- src/Filters.py.old 2009-06-09 14:02:11.000000000 +0900
> +++ src/Filters.py 2009-06-09 14:04:54.000000000 +0900
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python
> '''
> Filters for the #filter directive as well as #transform
>
> --- src/NameMapper.py.old 2009-06-09 14:02:18.000000000 +0900
> +++ src/NameMapper.py 2009-06-09 14:04:54.000000000 +0900
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python
> # $Id: NameMapper.py,v 1.32 2007/12/10 19:20:09 tavis_rudd Exp $
>
> """This module supports Cheetah's optional NameMapper syntax.
> --- src/Parser.py.old 2009-06-09 14:02:34.000000000 +0900
> +++ src/Parser.py 2009-06-09 14:04:54.000000000 +0900
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python
> # $Id: Parser.py,v 1.137 2008/03/10 05:25:13 tavis_rudd Exp $
> """Parser classes for Cheetah's Compiler
>
> --- src/Servlet.py.old 2009-06-09 14:02:42.000000000 +0900
> +++ src/Servlet.py 2009-06-09 14:04:54.000000000 +0900
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python
> '''
> Provides an abstract Servlet baseclass for Cheetah's Template class
> '''
> --- src/__init__.py.old 2009-06-09 14:13:30.000000000 +0900
> +++ src/__init__.py 2009-06-09 14:13:38.000000000 +0900
> @@ -1,5 +1,3 @@
> -#!/usr/bin/env python
> -
> '''
> Cheetah is an open source template engine and code generation tool.
>
> --- src/Template.py.old 2009-06-09 14:13:14.000000000 +0900
> +++ src/Template.py 2009-06-09 14:13:56.000000000 +0900
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python
> '''
> Provides the core API for Cheetah.
>
> --- src/Tools/RecursiveNull.py.old 2009-06-09 14:13:26.000000000 +0900
> +++ src/Tools/RecursiveNull.py 2009-06-09 14:13:44.000000000 +0900
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python
> """
> Nothing, but in a friendly way. Good for filling in for objects you want to
> hide. If $form.f1 is a RecursiveNull object, then
> --- src/contrib/markdown/extensions/html_tidy.py.old 2009-06-09 14:18:13.000000000 +0900
> +++ src/contrib/markdown/extensions/html_tidy.py 2009-06-09 14:18:26.000000000 +0900
> @@ -1,5 +1,3 @@
> -#!/usr/bin/env python
> -
> """
> HTML Tidy Extension for Python-Markdown
> =======================================
> --- src/contrib/markdown/extensions/extra.py.old 2009-06-09 14:18:13.000000000 +0900
> +++ src/contrib/markdown/extensions/extra.py 2009-06-09 14:18:29.000000000 +0900
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python
> """
> Python-Markdown Extra Extension
> ===============================
> --- src/contrib/markdown/extensions/fenced_code.py.old 2009-06-09 14:18:13.000000000 +0900
> +++ src/contrib/markdown/extensions/fenced_code.py 2009-06-09 14:18:30.000000000 +0900
> @@ -1,5 +1,3 @@
> -#!/usr/bin/env python
> -
> """
> Fenced Code Extension for Python Markdown
> =========================================
> --- src/contrib/markdown/extensions/wikilinks.py.old 2009-06-09 14:18:13.000000000 +0900
> +++ src/contrib/markdown/extensions/wikilinks.py 2009-06-09 14:18:32.000000000 +0900
> @@ -1,5 +1,3 @@
> -#!/usr/bin/env python
> -
> '''
> WikiLinks Extension for Python-Markdown
> ======================================
--
-R. Tyler Ballance
Slide, Inc.
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables unlimited
royalty-free distribution of the report engine for externally facing
server and web deployment.
http://p.sf.net/sfu/businessobjects_______________________________________________
Cheetahtemplate-discuss mailing list
Cheetahtemplate-discuss@...
https://lists.sourceforge.net/lists/listinfo/cheetahtemplate-discuss
attachment0 (204 bytes) 