Bug #280460 - Wrap portage.os with unicode encode/decode wrappers.

svn path=/main/trunk/; revision=13989

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 358de52b7ec2e7b786422993297e5f5b1746f3a2..8d09333d696fde821387e5ca77ea65816361cf32 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -188,6 +188,8 @@ if sys.hexversion >= 0x3000000:
        def _unicode_module_wrapper(mod):
                return mod
 
+os = _unicode_module_wrapper(os)
+
 def _shell_quote(s):
        """
        Quote a string in double-quotes and use backslashes to

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 6109c81b4eb8487724bcd0ddc2586e10d40ee4c7..f89d6793eb327765d79834e9b83d6d4fb2768c2c 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -39,12 +39,12 @@ from portage import listdir, dep_expand, digraph, flatten, key_expand, \
 from portage.cache.mappings import slot_dict_class
 
 import codecs
-import os, re, shutil, stat, errno, copy, subprocess
+import re, shutil, stat, errno, copy, subprocess
 import logging
 import sys
 from itertools import izip
 
-os = _unicode_module_wrapper(os)
+os = portage.os
 
 try:
        import cPickle as pickle