Mercurial > kallithea
comparison rhodecode/controllers/api/__init__.py @ 2165:dc2584ba5fbc
merged beta into default branch
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Wed, 28 Mar 2012 19:54:16 +0200 |
| parents | 82a88013a3fd 12ceeda33339 |
| children | 63e58ef80ef1 |
comparison
equal
deleted
inserted
replaced
| 2097:8fd6650bb436 | 2165:dc2584ba5fbc |
|---|---|
| 231 error=self._error) | 231 error=self._error) |
| 232 | 232 |
| 233 try: | 233 try: |
| 234 return json.dumps(response) | 234 return json.dumps(response) |
| 235 except TypeError, e: | 235 except TypeError, e: |
| 236 log.debug('Error encoding response: %s' % e) | 236 log.error('API FAILED. Error encoding response: %s' % e) |
| 237 return json.dumps( | 237 return json.dumps( |
| 238 dict( | 238 dict( |
| 239 self._req_id, | 239 id=self._req_id, |
| 240 result=None, | 240 result=None, |
| 241 error="Error encoding response" | 241 error="Error encoding response" |
| 242 ) | 242 ) |
| 243 ) | 243 ) |
| 244 | 244 |