diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-09-21 14:47:40 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-09-21 14:47:40 +0000 |
| commit | e0bc361e32fcc4340bf31289f95e72cfa9ca1ed1 (patch) | |
| tree | 61b323124e6a5cf28dcc8d24b1719a326c541ecb /pym | |
| parent | 2a8bc90521dde9b239c2c4b09825bfe0a0d3686d (diff) | |
| download | portage-e0bc361e32fcc4340bf31289f95e72cfa9ca1ed1.tar.gz portage-e0bc361e32fcc4340bf31289f95e72cfa9ca1ed1.tar.bz2 portage-e0bc361e32fcc4340bf31289f95e72cfa9ca1ed1.zip | |
Fix breakage in _unicode_encode() for non-string types.
svn path=/main/trunk/; revision=14323
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/__init__.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index e3fee8084..fe696b6dc 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -142,7 +142,10 @@ if _encodings['merge'] is None: def _unicode_encode(s, encoding=_encodings['content'], errors='backslashreplace'): - if not isinstance(s, bytes): + if sys.hexversion >= 0x3000000: + if isinstance(s, str): + s = s.encode(encoding, errors) + elif isinstance(s, unicode): s = s.encode(encoding, errors) return s |