From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QSeJC-0005Fd-Kj for garchives@archives.gentoo.org; Sat, 04 Jun 2011 00:01:42 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4744A1C040; Sat, 4 Jun 2011 00:01:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0F6931C040 for ; Sat, 4 Jun 2011 00:01:32 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7EC751B402E for ; Sat, 4 Jun 2011 00:01:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id DD8F180506 for ; Sat, 4 Jun 2011 00:01:31 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/, pym/portage/util/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/__init__.py pym/portage/util/__init__.py pym/portage/util/mtimedb.py X-VCS-Directories: pym/portage/ pym/portage/util/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: f95d917258f4bf9d56f20588b6dab5f5d1e0cc40 Date: Sat, 4 Jun 2011 00:01:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 86de4853bcb94d8902aa2428c6e1e255 commit: f95d917258f4bf9d56f20588b6dab5f5d1e0cc40 Author: Zac Medico gentoo org> AuthorDate: Sat Jun 4 00:01:13 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Jun 4 00:01:13 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Df95d9172 Move pickle import out of base portage module. --- pym/portage/__init__.py | 4 ---- pym/portage/util/__init__.py | 2 +- pym/portage/util/mtimedb.py | 6 +++++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 9732a74..1b96dab 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -17,10 +17,6 @@ try: errno.ESTALE =3D -1 import re import types - try: - import cPickle as pickle - except ImportError: - import pickle =20 try: from subprocess import getstatusoutput as subprocess_getstatusoutput diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py index 138553a..28e9428 100644 --- a/pym/portage/util/__init__.py +++ b/pym/portage/util/__init__.py @@ -28,12 +28,12 @@ import traceback =20 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 175bd8f..571fe5a 100644 --- a/pym/portage/util/mtimedb.py +++ b/pym/portage/util/mtimedb.py @@ -4,9 +4,13 @@ __all__ =3D ['MtimeDB'] =20 import copy +try: + import cPickle as pickle +except ImportError: + import pickle =20 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, wri= temsg