Author: chrisz
Date: Sat Jan 26 05:54:46 2008
New Revision: 4047
URL: http://trac.turbogears.org/changeset/4047
Log:
Merged 1.0 branch up to r3565 into 1.1.
Modified:
branches/1.1/setup.py
branches/1.1/turbogears/controllers.py
branches/1.1/turbogears/tests/catwalk_models/ (props changed)
branches/1.1/turbogears/util.py
Modified: branches/1.1/setup.py
==============================================================================
--- branches/1.1/setup.py (original)
+++ branches/1.1/setup.py Sat Jan 26 05:54:46 2008
@@ -23,7 +23,7 @@
"setuptools >= 0.6c2",
"simplejson >= 1.3",
"TurboCheetah >= 1.0",
- "TurboJson >= 0.9.9",
+ "TurboJson >= 1.1.2",
]
# for when we get rid of Kid & SQLObject dependency
Modified: branches/1.1/turbogears/controllers.py
==============================================================================
--- branches/1.1/turbogears/controllers.py (original)
+++ branches/1.1/turbogears/controllers.py Sat Jan 26 05:54:46 2008
@@ -558,7 +558,7 @@
"""
Redirect (via cherrypy.HTTPRedirect).
Raises the exception instead of returning it, this to allow
- users to both call it as a function or to raise it as an exeption.
+ users to both call it as a function or to raise it as an exception.
"""
raise cherrypy.HTTPRedirect(
url(tgpath=redirect_path, tgparams=redirect_params, **kw))
Modified: branches/1.1/turbogears/util.py
==============================================================================
--- branches/1.1/turbogears/util.py (original)
+++ branches/1.1/turbogears/util.py Sat Jan 26 05:54:46 2008
@@ -322,7 +322,7 @@
# and return None to tell caller we did not
# succeed
msg = "tg.utils: Could not import %s " % dottedpath
- msg += "because excpetion occured"
+ msg += "because exception occured"
logging.exception(msg)
return None
