Move _emerge.SlotObject to portage.util.

diff --git a/pym/_emerge/AbstractDepPriority.py b/pym/_emerge/AbstractDepPriority.py
index 94a9379a525bd23e24f84bb0a434120db2ff3874..94f26efc5bd47e7c00853219e9d5bb7786c2bf2a 100644 (file)
--- a/pym/_emerge/AbstractDepPriority.py
+++ b/pym/_emerge/AbstractDepPriority.py
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 import copy
-from _emerge.SlotObject import SlotObject
+from portage.util.SlotObject import SlotObject
 
 class AbstractDepPriority(SlotObject):
        __slots__ = ("buildtime", "runtime", "runtime_post")

diff --git a/pym/_emerge/AsynchronousTask.py b/pym/_emerge/AsynchronousTask.py
index a1467b0b52e286b547f6c4cd50d83ca691fe2e82..df72bae556b0c931ab9d3c0c0ac1b9099ca4bb87 100644 (file)
--- a/pym/_emerge/AsynchronousTask.py
+++ b/pym/_emerge/AsynchronousTask.py
@@ -1,8 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 from portage import os
-from _emerge.SlotObject import SlotObject
+from portage.util.SlotObject import SlotObject
+
 class AsynchronousTask(SlotObject):
        """
        Subclasses override _wait() and _poll() so that calls

diff --git a/pym/_emerge/Dependency.py b/pym/_emerge/Dependency.py
index 0f746b66f99c77375a20d98e9d7bf98a3331009c..c2d36b2dcaa9819766345c091eb32ea33f77f4c0 100644 (file)
--- a/pym/_emerge/Dependency.py
+++ b/pym/_emerge/Dependency.py
@@ -1,8 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+from portage.util.SlotObject import SlotObject
 from _emerge.DepPriority import DepPriority
-from _emerge.SlotObject import SlotObject
+
 class Dependency(SlotObject):
        __slots__ = ("atom", "blocker", "child", "depth",
                "parent", "onlydeps", "priority", "root",

diff --git a/pym/_emerge/EbuildBuildDir.py b/pym/_emerge/EbuildBuildDir.py
index ddc5fe0b45d0b94d855a1a908440d516a4ce53ba..9773bd79002e754314d3e70f3b16660c761e531b 100644 (file)
--- a/pym/_emerge/EbuildBuildDir.py
+++ b/pym/_emerge/EbuildBuildDir.py
@@ -1,11 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 from _emerge.AsynchronousLock import AsynchronousLock
-from _emerge.SlotObject import SlotObject
+
 import portage
 from portage import os
 from portage.exception import PortageException
+from portage.util.SlotObject import SlotObject
 import errno
 
 class EbuildBuildDir(SlotObject):

diff --git a/pym/_emerge/EbuildFetchonly.py b/pym/_emerge/EbuildFetchonly.py
index d0f954c245f68294f635704f6601618fd481ee22..f88ea96ef276d87909104327ff9c070c0e1bfabf 100644 (file)
--- a/pym/_emerge/EbuildFetchonly.py
+++ b/pym/_emerge/EbuildFetchonly.py
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-from _emerge.SlotObject import SlotObject
 import portage
 from portage import os
 from portage.elog.messages import eerror
+from portage.util.SlotObject import SlotObject
 
 class EbuildFetchonly(SlotObject):
 

diff --git a/pym/_emerge/PollScheduler.py b/pym/_emerge/PollScheduler.py
index be41565ddb7ac34b56cbfb4854bf2a5ef769f92a..8f01838059651bedc1c4c6236858ebd3192b2979 100644 (file)
--- a/pym/_emerge/PollScheduler.py
+++ b/pym/_emerge/PollScheduler.py
@@ -12,9 +12,9 @@ except ImportError:
 from portage import _encodings
 from portage import _unicode_encode
 from portage.util import writemsg_level
+from portage.util.SlotObject import SlotObject
 from portage.util._eventloop.global_event_loop import global_event_loop
 
-from _emerge.SlotObject import SlotObject
 from _emerge.getloadavg import getloadavg
 
 class PollScheduler(object):

diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py
index c797c32419c70be7ca1e919dcb52c290ee7e27db..b76d9ee96924b411b48adb2a9f3062eac502d0c1 100644 (file)
--- a/pym/_emerge/Scheduler.py
+++ b/pym/_emerge/Scheduler.py
@@ -27,6 +27,7 @@ bad = create_color_func("BAD")
 from portage._sets import SETPREFIX
 from portage._sets.base import InternalPackageSet
 from portage.util import ensure_dirs, writemsg, writemsg_level
+from portage.util.SlotObject import SlotObject
 from portage.package.ebuild.digestcheck import digestcheck
 from portage.package.ebuild.digestgen import digestgen
 from portage.package.ebuild.doebuild import (_check_temp_dir,
@@ -56,7 +57,6 @@ from _emerge.MergeListItem import MergeListItem
 from _emerge.Package import Package
 from _emerge.PackageMerge import PackageMerge
 from _emerge.PollScheduler import PollScheduler
-from _emerge.SlotObject import SlotObject
 from _emerge.SequentialTaskQueue import SequentialTaskQueue
 
 if sys.hexversion >= 0x3000000:

diff --git a/pym/_emerge/SequentialTaskQueue.py b/pym/_emerge/SequentialTaskQueue.py
index ebff430e3960e245ba6a7a6a0ce325d932d1adb6..80908936c71c04bbb92c9ec0a5b96c5261368997 100644 (file)
--- a/pym/_emerge/SequentialTaskQueue.py
+++ b/pym/_emerge/SequentialTaskQueue.py
@@ -1,9 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-import sys
-from _emerge.SlotObject import SlotObject
 from collections import deque
+import sys
+
+from portage.util.SlotObject import SlotObject
+
 class SequentialTaskQueue(SlotObject):
 
        __slots__ = ("max_jobs", "running_tasks") + \

diff --git a/pym/_emerge/Task.py b/pym/_emerge/Task.py
index efbe3a99d15412ae44b42f7754209b19087623f4..40f5066c011d5a8788815ee73af46130dfdb956b 100644 (file)
--- a/pym/_emerge/Task.py
+++ b/pym/_emerge/Task.py
@@ -1,7 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-from _emerge.SlotObject import SlotObject
+from portage.util.SlotObject import SlotObject
+
 class Task(SlotObject):
        __slots__ = ("_hash_key", "_hash_value")
 

diff --git a/pym/_emerge/SlotObject.py b/pym/portage/util/SlotObject.py
similarity index 100%
rename from pym/_emerge/SlotObject.py
rename to pym/portage/util/SlotObject.py

diff --git a/pym/portage/util/_eventloop/EventLoop.py b/pym/portage/util/_eventloop/EventLoop.py
index 9e4ac28a250e2395812e5355d8a57a68e4ae182d..763d3afd45e143852ea2494897c0a13eabdffcdd 100644 (file)
--- a/pym/portage/util/_eventloop/EventLoop.py
+++ b/pym/portage/util/_eventloop/EventLoop.py
@@ -10,8 +10,8 @@ import signal
 import time
 
 from portage.util import writemsg_level
+from portage.util.SlotObject import SlotObject
 
-from _emerge.SlotObject import SlotObject
 from _emerge.PollConstants import PollConstants
 from _emerge.PollSelectAdapter import PollSelectAdapter