Mercurial > kallithea

comparison rhodecode/controllers/feed.py @ 3292:2464ac75d77a beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed #746 unicodeDedode errors on feed controllers
author Marcin Kuzminski <marcin@python-works.com>
date Fri, 01 Feb 2013 00:07:23 +0100
parents 48cbd37cf6fc
children ec6354949623
comparison
equal deleted inserted replaced
3291:f4ce9416cbd5 3292:2464ac75d77a
34 from rhodecode.lib import helpers as h 34 from rhodecode.lib import helpers as h
35 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator 35 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
36 from rhodecode.lib.base import BaseRepoController 36 from rhodecode.lib.base import BaseRepoController
37 from rhodecode.lib.diffs import DiffProcessor, LimitedDiffContainer 37 from rhodecode.lib.diffs import DiffProcessor, LimitedDiffContainer
38 from rhodecode.model.db import CacheInvalidation 38 from rhodecode.model.db import CacheInvalidation
39 from rhodecode.lib.utils2 import safe_int, str2bool 39 from rhodecode.lib.utils2 import safe_int, str2bool, safe_unicode
40 40
41 log = logging.getLogger(__name__) 41 log = logging.getLogger(__name__)
42 42
43 43
44 class FeedController(BaseRepoController): 44 class FeedController(BaseRepoController):
111 desc_msg.extend(changes) 111 desc_msg.extend(changes)
112 if self.include_diff: 112 if self.include_diff:
113 desc_msg.append('\n\n') 113 desc_msg.append('\n\n')
114 desc_msg.append(diff_processor.as_raw()) 114 desc_msg.append(diff_processor.as_raw())
115 desc_msg.append('</pre>') 115 desc_msg.append('</pre>')
116 return desc_msg 116 return map(safe_unicode, desc_msg)
117 117
118 def atom(self, repo_name): 118 def atom(self, repo_name):
119 """Produce an atom-1.0 feed via feedgenerator module""" 119 """Produce an atom-1.0 feed via feedgenerator module"""
120 120
121 @cache_region('long_term') 121 @cache_region('long_term')