Attachment 304439 Details for Bug 261961 – only convert unicode objects to utf8

[patch] only convert unicode objects to utf8

yum-utf8-urlgrabber.patch (text/plain), 1.88 KB, created by Toshio Ernie Kuratomi on 2008-05-03 04:37:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Toshio Ernie Kuratomi

Created: 2008-05-03 04:37:49 UTC

Size: 1.88 KB

patch

obsolete

>diff --git a/yum/misc.py b/yum/misc.py
>index 3c03cff..61e7a24 100644
>--- a/yum/misc.py
>+++ b/yum/misc.py
>@@ -536,6 +536,12 @@ def to_unicode(obj, encoding='utf-8', errors='replace'):
>             obj = unicode(obj, encoding, errors)
>     return obj
> 
>+def to_utf8(obj, errors='replace'):
>+    '''convert 'unicode' to an encoded byte string '''
>+    if isinstance(obj, unicode):
>+        obj = obj.encode('utf-8', errors)
>+    return obj
>+
> def to_unicode_maybe(obj, encoding='utf-8', errors='replace'):
>     ''' Don't ask don't tell, only use when you must '''
>     try:
>diff --git a/yum/yumRepo.py b/yum/yumRepo.py
>index 3815ced..6d8ca90 100644
>--- a/yum/yumRepo.py
>+++ b/yum/yumRepo.py
>@@ -624,10 +624,11 @@ class YumRepository(Repository, config.RepoConf):
>             ug.opts.user_agent = default_grabber.opts.user_agent
> 
>             remote = url + '/' + relative
>-
>+            remote = misc.to_utf8(remote)
>+            encodedtext = misc.to_utf8(text)
>             try:
>                 result = ug.urlgrab(remote, local,
>-                                    text=text,
>+                                    text=encodedtext,
>                                     range=(start, end),
>                                     )
>             except URLGrabError, e:
>@@ -640,8 +641,10 @@ class YumRepository(Repository, config.RepoConf):
> 
>         else:
>             try:
>-                result = self.grab.urlgrab(relative, local,
>-                                           text = text,
>+                encodedrelative = misc.to_utf8(relative)
>+                encodedtext = misc.to_utf8(text)
>+                result = self.grab.urlgrab(encodedrelative, local,
>+                                           text = encodedtext,
>                                            range = (start, end),
>                                            copy_local=copy_local,
>                                            reget = reget,

Actions: View | Diff

Attachments on bug 261961: 177681 | 299034 | 304434 | 304439