Use a single sys.hexversion conditional for both _unicode_func_wrapper()

and _unicode_module_wrapper().

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

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index f4fb04890b4a881ef037b4ea49c5bf1a48a2cffe..9150e4054369b1066fad3cd76beba3f706531c9c 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -178,6 +178,8 @@ class _unicode_module_wrapper(object):
                return result
 
 if sys.hexversion >= 0x3000000:
+       def _unicode_func_wrapper(func):
+               return func
        def _unicode_module_wrapper(mod):
                return mod
 

diff --git a/pym/portage/data.py b/pym/portage/data.py
index d87387bdc7b49c86d416d0b2bf873f62d8ba60d5..5d5219be98c12c692ac450a390bd1b940440478b 100644 (file)
--- a/pym/portage/data.py
+++ b/pym/portage/data.py
@@ -35,8 +35,7 @@ if not lchown:
                                        " exist.  Please rebuild python.\n", noiselevel=-1)
                        lchown()
 
-if sys.hexversion < 0x3000000:
-       lchown = portage._unicode_func_wrapper(lchown)
+lchown = portage._unicode_func_wrapper(lchown)
 
 def portage_group_warning():
        warn_prefix = colorize("BAD", "*** WARNING ***  ")