summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Ipsum <richard.ipsum@codethink.co.uk>2015-08-19 17:14:04 +0000
committerRichard Ipsum <richard.ipsum@codethink.co.uk>2015-08-24 12:43:00 +0000
commit6c41719a020e16a33fcb06a14d6a4e1e5571feb6 (patch)
tree0d203d199ae93b7f5f37c2f15758133745c31883
parentbacc5a9862d64a057762724810e7412128bdc002 (diff)
downloadimport-6c41719a020e16a33fcb06a14d6a4e1e5571feb6.tar.gz
Simplify accessors in package
Change-Id: I38dc72c2348883abea56bd58a3195df4dc197c8a
-rw-r--r--baserockimport/mainloop.py6
-rw-r--r--baserockimport/package.py30
2 files changed, 18 insertions, 18 deletions
diff --git a/baserockimport/mainloop.py b/baserockimport/mainloop.py
index 0571e5c..2e18d07 100644
--- a/baserockimport/mainloop.py
+++ b/baserockimport/mainloop.py
@@ -217,7 +217,7 @@ class ImportLoop(object):
logging.debug('Checked out version: %s\tRef: %s',
checked_out_version, ref)
- package.set_version_in_use(checked_out_version)
+ package.version_in_use = checked_out_version
repo_path = os.path.relpath(source_repo.dirname)
if morphlib.git.is_valid_sha1(ref):
@@ -253,7 +253,7 @@ class ImportLoop(object):
dependencies = self._find_or_create_dependency_list(
kind, name, checked_out_version, source_repo)
- package.set_dependencies(dependencies)
+ package.dependencies = dependencies
def _update_queue_and_graph(self, current_item, dependencies, to_process,
processed, errors):
@@ -302,7 +302,7 @@ class ImportLoop(object):
if is_build_dep or current_item.is_build_dep:
# A runtime dep of a build dep becomes a build dep itself.
- dep_package.set_is_build_dep(True)
+ dep_package.is_build_dep = True
processed.add_edge(dep_package, current_item)
def _find_or_create_lorry_file(self, kind, name, version):
diff --git a/baserockimport/package.py b/baserockimport/package.py
index 361022f..6360cd8 100644
--- a/baserockimport/package.py
+++ b/baserockimport/package.py
@@ -23,9 +23,9 @@ class Package(object):
'''
def __init__(self, kind, name, version):
- self.kind = kind
- self.name = name
- self.version = version
+ self._kind = kind
+ self._name = name
+ self._version = version
self.required_by = []
self.morphology = None
self.repo_url = None
@@ -57,18 +57,18 @@ class Package(object):
self.name == name and
self.version == version)
- # FIXME: these accessors are useless, but I want there to be some way
- # of making it clear that some of the state of the Package object is
- # mutable and some of the state is not ...
+ @property
+ def kind(self):
+ return self._kind
- def set_morphology(self, morphology):
- self.morphology = morphology
+ @property
+ def name(self):
+ return self._name
- def set_dependencies(self, dependencies):
- self.dependencies = dependencies
+ @property
+ def version(self):
+ return self._version
- def set_is_build_dep(self, is_build_dep):
- self.is_build_dep = is_build_dep
-
- def set_version_in_use(self, version_in_use):
- self.version_in_use = version_in_use
+ @property
+ def parent(self):
+ return self.required_by[0] if len(self.required_by) > 0 else None