Mercurial > kallithea
diff rhodecode/controllers/api/__init__.py @ 1818:cf51bbfb120e beta
auto white-space removal
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Thu, 29 Dec 2011 07:35:51 +0200 |
parents | 6274adc06988 |
children | 89efedac4e6c |
line wrap: on
line diff
--- a/rhodecode/controllers/api/__init__.py Thu Dec 29 06:59:07 2011 +0200 +++ b/rhodecode/controllers/api/__init__.py Thu Dec 29 07:35:51 2011 +0200 @@ -7,19 +7,19 @@ :created_on: Aug 20, 2011 :author: marcink - :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com> + :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com> :license: GPLv3, see COPYING for more details. """ # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; version 2 # of the License or (at your opinion) any later version of the license. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, @@ -226,7 +226,7 @@ if self._error is not None: raw_response = None - response = dict(id=self._req_id, result=raw_response, + response = dict(id=self._req_id, result=raw_response, error=self._error) try: @@ -259,4 +259,3 @@ return func else: raise AttributeError("No such method: %s" % self._req_method) -