# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1290715600 28800
# Node ID f5ca54558292189141390b5f466aeec978cb5301
# Parent  cf18ea0313f98c95a7f870713187280b559f5bbf
remove previous hacks

diff -r cf18ea0313f9 -r f5ca54558292 decoupage/web.py
--- a/decoupage/web.py	Sun Nov 21 17:00:02 2010 -0800
+++ b/decoupage/web.py	Thu Nov 25 12:06:40 2010 -0800
@@ -20,7 +20,7 @@
 from pkg_resources import resource_filename
 from webob import Request, Response, exc
 
-transformers = [i.lower() for i in transformers()]
+transformers = transformers()
 
 class Decoupage(object):
 
@@ -51,7 +51,7 @@
             assert os.path.isdir(directory), "Decoupage template directory %s does not exist!" % directory
 
         # static file server
-        self.fileserver = FileApp # XXX still used?!?
+        self.fileserver = FileApp
 
         # pluggable formats
         s = 'decoupage.format.'
@@ -115,12 +115,12 @@
                     kwargs = {}
                     for i in conf:
                         if i.startswith('/'):
-                            name = i[1:].lower()
+                            name = i[1:]
                             if name in transformers:
                                 kwargs[name] = dict([j.split('=', 1) for j in conf[i].split(',') if '=' in j])
                     fileserver = FileTypeTransformer(*args, **kwargs)
                 else:
-                    fileserver = FileApp
+                    fileserver = self.fileserver
                     
                 fileserver = fileserver(path)
                 return fileserver(environ, start_response)
@@ -249,7 +249,7 @@
                               'type': link})
             
         for f in files:
-            f['description'] = conf.get(f['name'].lower(), None)
+            f['description'] = conf.get(f['name'], None)
 
         return files
 
diff -r cf18ea0313f9 -r f5ca54558292 setup.py
--- a/setup.py	Sun Nov 21 17:00:02 2010 -0800
+++ b/setup.py	Thu Nov 25 12:06:40 2010 -0800
@@ -6,7 +6,7 @@
 except IOError:
     description = ''
 
-version = '0.10.0'
+version = '0.10.1'
 
 setup(name='decoupage',
       version=version,
@@ -26,8 +26,8 @@
           'Paste',
           'PasteScript',
           'genshi',
-          'martINI',
-          'contenttransformer',
+          'martINI>=0.4',
+          'contenttransformer>=0.3.3',
           'PyRSS2Gen',
          ],
       dependency_links=['http://www.dalkescientific.com/Python/PyRSS2Gen-1.0.0.tar.gz#egg=PyRSS2Gen'],