external_python_mako, branch w_json_metadata Python mako - Fixed bug in ``decode.<encoding>`` filter where a non-string object 2014-04-21T01:43:55+00:00 Mike Bayer mike_mp@zzzcomputing.com 2014-04-21T01:43:55+00:00 81f27474ff7795a59bf1547ab7042b6ae36ea907 would not be correctly interpreted in Python 3. 
would not be correctly interpreted in Python 3.
- add module source thing as ModuleInfo.get_module_source_metadata 2014-04-14T15:21:10+00:00 Mike Bayer mike_mp@zzzcomputing.com 2014-04-14T15:21:10+00:00 6d96ef8c2d454622070d2d63ed0a2a911cde3834 






Merge branch 'master' into w_json_metadata
2014-04-13T17:48:48+00:00

Mike Bayer
mike_mp@zzzcomputing.com

2014-04-13T17:48:48+00:00

10c0aae0e06832d7a1684063246568dc93217b7a

Conflicts:
	doc/build/changelog.rst





Conflicts:
	doc/build/changelog.rst







- add py.test settings
2014-04-13T17:47:25+00:00

Mike Bayer
mike_mp@zzzcomputing.com

2014-04-13T17:47:25+00:00

c2373cede978a62eb3c142c5ca4bb1a02a32b3ad

- fix this update_wrapper thing so tests are reported nicely





- fix this update_wrapper thing so tests are reported nicely







- Fixed bug in Python parsing logic which would fail on Python 3
2014-04-13T17:35:13+00:00

Mike Bayer
mike_mp@zzzcomputing.com

2014-04-13T17:35:13+00:00

c314ecf67074218cae1ae0c8591a711f37758c72

when a "try/except" targeted a tuple of exception types, rather
than a single exception. fixes #227





when a "try/except" targeted a tuple of exception types, rather
than a single exception. fixes #227







- edit new documentation section regarding includes and inheritance
2014-04-11T18:50:32+00:00

Mike Bayer
mike_mp@zzzcomputing.com

2014-04-11T18:50:32+00:00

0b1cce614cfd7ad95083cf3aa8b41462ba932762












Merge branch 'master' of github.com:zzzeek/mako
2014-04-11T18:35:44+00:00

Mike Bayer
mike_mp@zzzcomputing.com

2014-04-11T18:35:44+00:00

3242ce139774209f54798ef9ee48cf93851ca748












Merge pull request #9 from jvanasco/master
2014-04-11T18:35:33+00:00

mike bayer
mike_mp@zzzcomputing.com

2014-04-11T18:35:33+00:00

fe494931b2ea1404f919a79e5949d9b57f8e2eef

added docs for inherit/include/block confusion




added docs for inherit/include/block confusion






changelog
2014-04-11T16:32:02+00:00

Mike Bayer
mike_mp@zzzcomputing.com

2014-04-11T16:32:02+00:00

4e2084b30eacf06375f7911a370ab4f8878ce2c7












Merge branch 'master' of bitbucket.org:zzzeek/mako into w_json_metadata
2014-04-11T16:30:05+00:00

Mike Bayer
mike_mp@zzzcomputing.com

2014-04-11T16:30:05+00:00

73be27022328eb60f719431fd70a63f1265cf473