  def add_domain(domain, url):
      if not url.startswith('http://'):
          # 'url' must already be ASCII and URL-quoted, so no need for encoding
          # conversions here.
          url = u'http://%s%s' % (domain, url)
      return url
  
  class FeedDoesNotExist(ObjectDoesNotExist):
      pass
  
 
</s> remove from django.utils.encoding import smart_unicode
 </s> add from django.utils.encoding import smart_unicode, iri_to_uri </s> remove         self.path = req.uri
 </s> add         self.path = force_unicode(req.uri) </s> remove         self.path = environ['PATH_INFO']
 </s> add         self.path = force_unicode(environ['PATH_INFO'])
        url = iri_to_uri(u'http://%s%s' % (domain, url))
  def add_domain(domain, url):
      if not url.startswith('http://'):
          # 'url' must already be ASCII and URL-quoted, so no need for encoding
          # conversions here.
        url = iri_to_uri(u'http://%s%s' % (domain, url))
      return url
  
  class FeedDoesNotExist(ObjectDoesNotExist):
      pass
  
keep keep keep keep replace keep keep keep keep keep
 Changed HttpRequest.path to be a Unicode object. It has already been
URL-decoded by the time we see it anyway, so keeping it as a UTF-8 bytestring
was causing unnecessary problems.

Also added handling for non-ASCII URL fragments in feed creation (the portion
that was outside the control of the Feed class was messed up).



git-svn-id: http://code.djangoproject.com/svn/django/trunk@5629 bcc190cf-cafb-0310-a4f2-bffc1f526a37 
django/contrib/syndication/feeds.py