diff options
author | Robert Collins <robertc@robertcollins.net> | 2009-06-17 21:47:34 +1000 |
---|---|---|
committer | Robert Collins <robertc@robertcollins.net> | 2009-06-17 21:47:34 +1000 |
commit | edb40a649dcae53acfa12932ccddaf99d66b0b1c (patch) | |
tree | 447af11e277564ffb2c459e717ca83eabc89207a | |
parent | 67d75808760811b276f72539aa3a635f64570208 (diff) | |
download | testresources-edb40a649dcae53acfa12932ccddaf99d66b0b1c.tar.gz |
Make TestResource.make_all and clean_all private methods.
-rw-r--r-- | lib/testresources/__init__.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/testresources/__init__.py b/lib/testresources/__init__.py index e8c0685..4bc7ef4 100644 --- a/lib/testresources/__init__.py +++ b/lib/testresources/__init__.py @@ -203,7 +203,7 @@ class TestResource(object): self._currentResource = None self.resources = list(getattr(self.__class__, "resources", [])) - def clean_all(self, resource): + def _clean_all(self, resource): """Clean the dependencies from resource, and then resource itself.""" self.clean(resource) for name, manager in self.resources: @@ -233,7 +233,7 @@ class TestResource(object): """ self._uses -= 1 if self._uses == 0: - self.clean_all(resource) + self._clean_all(resource) self._setResource(None) def getResource(self): @@ -245,7 +245,7 @@ class TestResource(object): that it is no longer needed. """ if self._uses == 0: - self._setResource(self.make_all()) + self._setResource(self._make_all()) elif self.isDirty(): self._resetResource(self._currentResource) self._uses += 1 @@ -269,7 +269,7 @@ class TestResource(object): finally: mgr.finishedWith(res) - def make_all(self): + def _make_all(self): """Make the dependencies of this resource and this resource.""" dependency_resources = {} for name, resource in self.resources: @@ -306,8 +306,8 @@ class TestResource(object): return result def _resetResource(self, old_resource): - self.clean_all(old_resource) - self._setResource(self.make_all()) + self._clean_all(old_resource) + self._setResource(self._make_all()) def _setResource(self, new_resource): """Set the current resource to a new value.""" |