most code changes to allow pickling Spec/Package can be undone now that the spec is passed as a dictionary rather than an object

scheibelp · scheibelp · commit 1dfaeac62cf0 · 2020-08-07T16:40:45.000-07:00
diff --git a/lib/spack/spack/fetch_strategy.py b/lib/spack/spack/fetch_strategy.py
@@ -214,17 +214,14 @@ def mirror_id(self):
         """BundlePackages don't have a mirror id."""
 
 
-class FetchStrategyComposite(pattern.Composite):
+@pattern.composite(interface=FetchStrategy)
+class FetchStrategyComposite(object):
     """Composite for a FetchStrategy object.
+
+    Implements the GoF composite pattern.
     """
     matches = FetchStrategy.matches
 
-    def __init__(self):
-        super(FetchStrategyComposite, self).__init__([
-            'fetch', 'check', 'expand', 'reset', 'archive', 'cachable',
-            'mirror_id'
-        ])
-
     def source_id(self):
         component_ids = tuple(i.source_id() for i in self)
         if all(component_ids):
diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py
@@ -798,10 +798,6 @@ def _make_resource_stage(self, root_stage, fetcher, resource):
                               path=self.path)
         return stage
 
-    def _download_search(self):
-        dynamic_fetcher = fs.from_list_url(self)
-        return [dynamic_fetcher] if dynamic_fetcher else []
-
     def _make_root_stage(self, fetcher):
         # Construct a mirror path (TODO: get this out of package.py)
         mirror_paths = spack.mirror.mirror_archive_paths(
@@ -813,8 +809,12 @@ def _make_root_stage(self, fetcher):
         stage_name = "{0}{1}-{2}-{3}".format(stage_prefix, s.name, s.version,
                                              s.dag_hash())
 
+        def download_search():
+            dynamic_fetcher = fs.from_list_url(self)
+            return [dynamic_fetcher] if dynamic_fetcher else []
+
         stage = Stage(fetcher, mirror_paths=mirror_paths, name=stage_name,
-                      path=self.path, search_fn=self._download_search)
+                      path=self.path, search_fn=download_search)
         return stage
 
     def _make_stage(self):
diff --git a/lib/spack/spack/stage.py b/lib/spack/spack/stage.py
@@ -648,19 +648,17 @@ def _add_to_root_stage(self):
                     install(src, destination_path)
 
 
-class StageComposite(pattern.Composite):
+@pattern.composite(method_list=[
+    'fetch', 'create', 'created', 'check', 'expand_archive', 'restage',
+    'destroy', 'cache_local', 'cache_mirror', 'managed_by_spack'])
+class StageComposite:
     """Composite for Stage type objects. The first item in this composite is
     considered to be the root package, and operations that return a value are
     forwarded to it."""
     #
     # __enter__ and __exit__ delegate to all stages in the composite.
     #
 
-    def __init__(self):
-        super(StageComposite, self).__init__([
-            'fetch', 'create', 'created', 'check', 'expand_archive', 'restage',
-            'destroy', 'cache_local', 'cache_mirror', 'managed_by_spack'])
-
     def __enter__(self):
         for item in self:
             item.__enter__()
diff --git a/lib/spack/spack/store.py b/lib/spack/spack/store.py
@@ -81,23 +81,10 @@ def _store():
 #: Singleton store instance
 store = llnl.util.lang.Singleton(_store)
 
-
-def _store_root():
-    return store.root
-
-
-def _store_db():
-    return store.db
-
-
-def _store_layout():
-    return store.layout
-
-
 # convenience accessors for parts of the singleton store
-root = llnl.util.lang.LazyReference(_store_root)
-db = llnl.util.lang.LazyReference(_store_db)
-layout = llnl.util.lang.LazyReference(_store_layout)
+root = llnl.util.lang.LazyReference(lambda: store.root)
+db = llnl.util.lang.LazyReference(lambda: store.db)
+layout = llnl.util.lang.LazyReference(lambda: store.layout)
 
 
 def retrieve_upstream_dbs():
diff --git a/lib/spack/spack/util/pattern.py b/lib/spack/spack/util/pattern.py
@@ -8,27 +8,6 @@
 import functools
 
 
-class Delegate(object):
-    def __init__(self, name, container):
-        self.name = name
-        self.container = container
-
-    def __call__(self, *args, **kwargs):
-        return [getattr(item, self.name)(*args, **kwargs)
-                for item in self.container]
-
-
-class Composite(list):
-    def __init__(self, fns_to_delegate):
-        self.fns_to_delegate = fns_to_delegate
-
-    def __getattr__(self, name):
-        if name != 'fns_to_delegate' and name in self.fns_to_delegate:
-            return Delegate(name, self)
-        else:
-            return self.__getattribute__(name)
-
-
 def composite(interface=None, method_list=None, container=list):
     """Decorator implementing the GoF composite pattern.
 
diff --git a/lib/spack/spack/util/prefix.py b/lib/spack/spack/util/prefix.py
@@ -49,9 +49,3 @@ def join(self, string):
             Prefix: the newly created installation prefix
         """
         return Prefix(os.path.join(self, string))
-
-    def __getstate__(self):
-        return self.__dict__
-
-    def __setstate__(self, d):
-        self.__dict__.update(d)
