Commits

Anonymous committed 7d4c39b Merge

merging to main.

  • Participants
  • Parent commits 26a135c, 485815b

Comments (0)

Files changed (3)

                     'nose',
                     'TurboKid >= 1.0.4',
                     'zope.sqlalchemy >= 0.4',
-                    'jinja',
+                    'jinja2',
                     'chameleon.genshi',
                     'repoze.what >= 1.0.5',
+                    'repoze.what-quickstart',
                     'repoze.who-testutil >= 1.0rc1',
                     'wsgiref',
+                    'tw.forms',
                     ]
 
 setup(

File tg/controllers/decoratedcontroller.py

         # if it's a string return that string and skip all the stuff
         if not isinstance(response, dict):
             return response
-
         """Return a JSON string representation of a Python object."""
 
         # Save these objeccts as locals from the SOP to avoid expensive lookups

File tg/tests/test_tg_controller_dispatch.py

         resp = self.app.get('/custom_content_type_with_ugliness')
         assert 'PNG' in resp, resp
         assert resp.headers['Content-Type'] == 'image/png', resp
-