Move pickle import out of base portage module.

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 9732a74b186edc80fdb7b8747e877d6c354c694d..1b96dab58bb82d55e26e060e34bbdfc379fccc2f 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -17,10 +17,6 @@ try:
                errno.ESTALE = -1
        import re
        import types
-       try:
-               import cPickle as pickle
-       except ImportError:
-               import pickle
 
        try:
                from subprocess import getstatusoutput as subprocess_getstatusoutput

diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py
index 138553a160b7106fe32eca5f625cd1a63c015317..28e9428d95115026894e67ebe403c881666d3214 100644 (file)
--- a/pym/portage/util/__init__.py
+++ b/pym/portage/util/__init__.py
@@ -28,12 +28,12 @@ import traceback
 
 import portage
 portage.proxy.lazyimport.lazyimport(globals(),
+       'pickle',
        'portage.dep:Atom',
        'portage.util.listdir:_ignorecvs_dirs'
 )
 from portage import StringIO
 from portage import os
-from portage import pickle
 from portage import subprocess_getstatusoutput
 from portage import _encodings
 from portage import _os_merge

diff --git a/pym/portage/util/mtimedb.py b/pym/portage/util/mtimedb.py
index 175bd8f46e12c71c4b318c50ff7bc1ec3fa8e3fb..571fe5a30b9be7478efc170f7a26696e016df192 100644 (file)
--- a/pym/portage/util/mtimedb.py
+++ b/pym/portage/util/mtimedb.py
@@ -4,9 +4,13 @@
 __all__ = ['MtimeDB']
 
 import copy
+try:
+       import cPickle as pickle
+except ImportError:
+       import pickle
 
 import portage
-from portage import pickle, _unicode_encode
+from portage import _unicode_encode
 from portage.data import portage_gid, uid
 from portage.localization import _
 from portage.util import apply_secpass_permissions, atomic_ofstream, writemsg