Changeset 5585
- Timestamp:
- 07/02/07 07:24:58 (1 year ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/branches/unicode/django/core/urlresolvers.py
r5580 r5585 39 39 during the import fail and the string is returned. 40 40 """ 41 if not callable(lookup_view): 42 mod_name, func_name = get_mod_func(lookup_view) 43 try: 44 if func_name != '': 45 lookup_view = getattr(__import__(mod_name, {}, {}, ['']), func_name) 46 except (ImportError, AttributeError): 47 if not can_fail: 48 raise 41 try: 42 # Bail out early if lookup_view is not ASCII. This can't be a function. 43 lookup_view = lookup_view.encode('ascii') 44 45 if not callable(lookup_view): 46 mod_name, func_name = get_mod_func(lookup_view) 47 try: 48 if func_name != '': 49 lookup_view = getattr(__import__(mod_name, {}, {}, ['']), func_name) 50 except (ImportError, AttributeError): 51 if not can_fail: 52 raise 53 except UnicodeEncodeError: 54 pass 49 55 return lookup_view 50 56 get_callable = memoize(get_callable, _callable_cache) … … 267 273 raise NoReverseMatch 268 274 if lookup_view in self.reverse_dict: 269 return ''.join([reverse_helper(part.regex, *args, **kwargs) for part in self.reverse_dict[lookup_view]])275 return u''.join([reverse_helper(part.regex, *args, **kwargs) for part in self.reverse_dict[lookup_view]]) 270 276 raise NoReverseMatch 271 277 django/branches/unicode/tests/regressiontests/templates/tests.py
r5580 r5585 736 736 'url03' : ('{% url regressiontests.templates.views.index %}', {}, '/url_tag/'), 737 737 'url04' : ('{% url named.client client.id %}', {'client': {'id': 1}}, '/url_tag/named-client/1/'), 738 'url05' : (u'{% url метка_оператора 1 %}', {}, '/url_tag/unicode/1/'), 738 739 739 740 # Failures django/branches/unicode/tests/regressiontests/templates/urls.py
r5531 r5585 1 # coding: utf-8 1 2 from django.conf.urls.defaults import * 2 3 from regressiontests.templates import views … … 9 10 (r'^client/(\d+)/(?P<action>[^/]+)/$', views.client_action), 10 11 url(r'^named-client/(\d+)/$', views.client, name="named.client"), 12 url(r'^unicode/(\d+)/$', views.client, name=u"метка_оператора"), 11 13 )
