Permalink
Browse files

Prune the contrib package which should have been removed when the mar…

…kdown module was added as a setuptools dependency
  • Loading branch information...
1 parent 6dec6a5 commit dc896aa348b7d5e4dbeed440c6ae8cf8ebdf2fdd R. Tyler Ballance committed Jul 16, 2009
Showing with 2 additions and 7 deletions.
  1. +0 −1 SetupConfig.py
  2. +2 −6 src/Filters.py
  3. 0 src/contrib/__init__.py
View
@@ -11,7 +11,6 @@
'Cheetah.Tests',
'Cheetah.Tools',
'Cheetah.Utils',
- 'Cheetah.contrib',
]
classifiers = [line.strip() for line in '''\
#Development Status :: 4 - Beta
View
@@ -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'
View
No changes.

0 comments on commit dc896aa

Please sign in to comment.