diff options
| -rw-r--r-- | SetupConfig.py | 1 | ||||
| -rw-r--r-- | src/Filters.py | 8 | ||||
| -rw-r--r-- | src/contrib/__init__.py | 0 |
3 files changed, 2 insertions, 7 deletions
diff --git a/SetupConfig.py b/SetupConfig.py index f0504c8..14521a8 100644 --- a/SetupConfig.py +++ b/SetupConfig.py @@ -11,7 +11,6 @@ packages = ['Cheetah', 'Cheetah.Tests', 'Cheetah.Tools', 'Cheetah.Utils', - 'Cheetah.contrib', ] classifiers = [line.strip() for line in '''\ #Development Status :: 4 - Beta diff --git a/src/Filters.py b/src/Filters.py index 6f16974..09ffa4e 100644 --- a/src/Filters.py +++ b/src/Filters.py @@ -5,7 +5,6 @@ #transform results in a filter on the entirety of the output ''' import sys -import Cheetah.contrib # Additional entities WebSafe knows how to transform. No need to include # '<', '>' or '&' since those will have been done already. @@ -89,11 +88,8 @@ class Markdown(EncodeUnicode): def filter(self, value, **kwargs): # This is a bit of a hack to allow outright embedding of the markdown module try: - markdown_path = '/'.join(Cheetah.contrib.__file__.split('/')[:-1]) - sys.path.append(markdown_path) - from Cheetah.contrib import markdown - sys.path.pop() - except: + import markdown + except ImportError: print '>>> Exception raised importing the "markdown" module' print '>>> Are you sure you have the ElementTree module installed?' print ' http://effbot.org/downloads/#elementtree' diff --git a/src/contrib/__init__.py b/src/contrib/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/src/contrib/__init__.py +++ /dev/null |