From ad9120c30b972a7ae814b5ef549bb121d523b432 Mon Sep 17 00:00:00 2001 From: Joe Jevnik Date: Tue, 4 Oct 2016 16:09:00 -0400 Subject: [PATCH] ENH: update aliasedmixin repr --- tests/pipeline/test_alias.py | 11 ++++++++++- zipline/pipeline/mixins.py | 6 +++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/tests/pipeline/test_alias.py b/tests/pipeline/test_alias.py index 3044fcdb92..ecd6045a16 100644 --- a/tests/pipeline/test_alias.py +++ b/tests/pipeline/test_alias.py @@ -29,9 +29,18 @@ def test_alias(self): def test_repr(self): assert_equal( repr(self.Term().alias('ayy lmao')), - "Aliased%s(..., name='ayy lmao')" % self.Term.__base__.__name__, + "Aliased%s(Term(...), name='ayy lmao')" % ( + self.Term.__base__.__name__, + ), ) + def test_short_repr(self): + for name in ('a', 'b'): + assert_equal( + self.Term().alias(name).short_repr(), + name, + ) + class TestFactorAlias(WithAlias, BasePipelineTestCase): class Term(Factor): diff --git a/zipline/pipeline/mixins.py b/zipline/pipeline/mixins.py index cd6048ad05..b5663dcb86 100644 --- a/zipline/pipeline/mixins.py +++ b/zipline/pipeline/mixins.py @@ -272,11 +272,15 @@ def _compute(self, inputs, dates, assets, mask): return inputs[0] def __repr__(self): - return '{type}(..., name={name!r})'.format( + return '{type}({inner_type}(...), name={name!r})'.format( type=type(self).__name__, + inner_type=type(self.inputs[0]).__name__, name=self.name, ) + def short_repr(self): + return self.name + @classmethod def make_aliased_type(cls, other_base): """