summaryrefslogtreecommitdiff
path: root/factory
diff options
context:
space:
mode:
authorRaphaël Barrois <raphael.barrois@polytechnique.org>2012-02-24 00:07:53 +0100
committerRaphaël Barrois <raphael.barrois@polytechnique.org>2012-02-24 00:07:53 +0100
commit2a1138550b3220b6f8cd23bae5fed03f0fb448cf (patch)
tree38b6b352c3efead96a410dddb5b524af2d22a9e2 /factory
parentff9d0f536bc443b81e6c95cf31644b6e19236538 (diff)
downloadfactory-boy-2a1138550b3220b6f8cd23bae5fed03f0fb448cf.tar
factory-boy-2a1138550b3220b6f8cd23bae5fed03f0fb448cf.tar.gz
Allow using '__' in factory.SelfAttribute.
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Diffstat (limited to 'factory')
-rw-r--r--factory/containers.py2
-rw-r--r--factory/declarations.py33
2 files changed, 31 insertions, 4 deletions
diff --git a/factory/containers.py b/factory/containers.py
index dd11f5f..ef97548 100644
--- a/factory/containers.py
+++ b/factory/containers.py
@@ -26,7 +26,7 @@ from factory import declarations
#: String for splitting an attribute name into a
#: (subfactory_name, subfactory_field) tuple.
-ATTR_SPLITTER = '__'
+ATTR_SPLITTER = declarations.ATTR_SPLITTER
class CyclicDefinitionError(Exception):
diff --git a/factory/declarations.py b/factory/declarations.py
index 0ce7071..60425c3 100644
--- a/factory/declarations.py
+++ b/factory/declarations.py
@@ -20,6 +20,12 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
+
+#: String for splitting an attribute name into a
+#: (subfactory_name, subfactory_field) tuple.
+ATTR_SPLITTER = '__'
+
+
class OrderedDeclaration(object):
"""A factory declaration.
@@ -58,6 +64,29 @@ class LazyAttribute(OrderedDeclaration):
return self.function(obj)
+def dig(obj, name):
+ """Try to retrieve the given attribute of an object, using ATTR_SPLITTER.
+
+ If ATTR_SPLITTER is '__', dig(foo, 'a__b__c') is equivalent to foo.a.b.c.
+
+ Args:
+ obj (object): the object of which an attribute should be read
+ name (str): the name of an attribute to look up.
+
+ Returns:
+ the attribute pointed to by 'name', according to ATTR_SPLITTER.
+
+ Raises:
+ AttributeError: if obj has no 'name' attribute.
+ """
+ may_split = (ATTR_SPLITTER in name and not name.startswith(ATTR_SPLITTER))
+ if may_split and not hasattr(obj, name):
+ attr, subname = name.split(ATTR_SPLITTER, 1)
+ return dig(getattr(obj, attr), subname)
+ else:
+ return getattr(obj, name)
+
+
class SelfAttribute(OrderedDeclaration):
"""Specific OrderedDeclaration copying values from other fields.
@@ -70,9 +99,7 @@ class SelfAttribute(OrderedDeclaration):
self.attribute_name = attribute_name
def evaluate(self, sequence, obj, containers=()):
- # TODO(rbarrois): allow the use of ATTR_SPLITTER to fetch fields of
- # subfactories.
- return getattr(obj, self.attribute_name)
+ return dig(obj, self.attribute_name)
class Sequence(OrderedDeclaration):