Mercurial > kallithea
changeset 1178:f128465845c0 beta
merge with unicode fixes
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sun, 27 Mar 2011 01:34:37 +0100 |
| parents | b3f48216e55e (diff) 014c9a58a0d9 (current diff) |
| children | 79283d4b1bed |
| files | |
| diffstat | 2 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/journal.py Thu Mar 24 16:35:53 2011 +0100 +++ b/rhodecode/controllers/journal.py Sun Mar 27 01:34:37 2011 +0100 @@ -31,7 +31,7 @@ from webhelpers.paginate import Page from itertools import groupby -from paste.httpexceptions import HTTPInternalServerError +from paste.httpexceptions import HTTPBadRequest from pylons import request, tmpl_context as c, response, url from pylons.i18n.translation import _ from webhelpers.feedgenerator import Atom1Feed, Rss201rev2Feed @@ -132,7 +132,7 @@ self.rhodecode_user.user_id) return 'ok' except: - raise HTTPInternalServerError() + raise HTTPBadRequest() repo_id = request.POST.get('follows_repo_id') if repo_id: @@ -141,11 +141,11 @@ self.rhodecode_user.user_id) return 'ok' except: - raise HTTPInternalServerError() + raise HTTPBadRequest() log.debug('token mismatch %s vs %s', cur_token, token) - raise HTTPInternalServerError() + raise HTTPBadRequest()
--- a/setup.py Thu Mar 24 16:35:53 2011 +0100 +++ b/setup.py Sun Mar 27 01:34:37 2011 +0100 @@ -14,10 +14,11 @@ "Mako>=0.4.0", "vcs>=0.2.0", "pygments>=1.4", - "mercurial>=1.7.5", - "whoosh>=1.3.4", + "mercurial>=1.8.1", + "whoosh>=1.8.0", "celery>=2.2.4", "babel", + "python-dateutil<=2.0", ] classifiers = ['Development Status :: 4 - Beta',