Skip to content

Commit

Permalink
MAINT: rename __inputs__->_input_attributes
Browse files Browse the repository at this point in the history
  • Loading branch information
Joe Jevnik committed Dec 19, 2016
1 parent fec8920 commit 27e325f
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion blaze/expr/arithmetic.py
Expand Up @@ -61,7 +61,7 @@

class BinOp(ElemWise):
_arguments = 'lhs', 'rhs'
__inputs__ = 'lhs', 'rhs'
_input_attributes = 'lhs', 'rhs'

def __str__(self):
lhs = parenthesize(eval_str(self.lhs))
Expand Down
2 changes: 1 addition & 1 deletion blaze/expr/arrays.py
Expand Up @@ -71,7 +71,7 @@ class TensorDot(Expr):
tensordot(x, y, axes=[0, 0])
"""
_arguments = 'lhs', 'rhs', '_left_axes', '_right_axes'
__inputs__ = 'lhs', 'rhs'
_input_attributes = 'lhs', 'rhs'

def _dshape(self):
# Compute shape
Expand Down
4 changes: 2 additions & 2 deletions blaze/expr/collections.py
Expand Up @@ -484,7 +484,7 @@ class Join(Expr):
blaze.expr.collections.Merge
"""
_arguments = 'lhs', 'rhs', '_on_left', '_on_right', 'how', 'suffixes'
__inputs__ = 'lhs', 'rhs'
_input_attributes = 'lhs', 'rhs'

@property
def on_left(self):
Expand Down Expand Up @@ -700,7 +700,7 @@ class Concat(Expr):
blaze.expr.collections.Merge
"""
_arguments = 'lhs', 'rhs', 'axis'
__inputs__ = 'lhs', 'rhs'
_input_attributes = 'lhs', 'rhs'

def _dshape(self):
axis = self.axis
Expand Down
4 changes: 2 additions & 2 deletions blaze/expr/core.py
Expand Up @@ -130,7 +130,7 @@ class Node(object):
blaze.expr.expressions.Expr
"""
_arguments = '_child',
__inputs__ = '_child',
_input_attributes = '_child',
__expr_instance_cache = WeakValueDictionary()

def __new__(cls, *args, **kwargs):
Expand Down Expand Up @@ -164,7 +164,7 @@ def _static_identity(cls, *args, **kwargs):

@property
def _inputs(self):
return tuple(getattr(self, i) for i in self.__inputs__)
return tuple(getattr(self, i) for i in self._input_attributes)

def _leaves(self):
""" Leaves of an expression tree
Expand Down
8 changes: 4 additions & 4 deletions blaze/expr/expressions.py
Expand Up @@ -295,7 +295,7 @@ class Symbol(Expr):
dshape("5 * 3 * {x: int32, y: int32}")
"""
_arguments = '_name', 'dshape', '_token'
__inputs__ = ()
_input_attributes = ()

def __repr__(self):
fmt = "<`{}` symbol; dshape='{}'>"
Expand Down Expand Up @@ -500,7 +500,7 @@ class Selection(Expr):
>>> deadbeats = accounts[accounts.amount < 0]
"""
_arguments = '_child', 'predicate'
__inputs__ = '_child', 'predicate'
_input_attributes = '_child', 'predicate'

@property
def _name(self):
Expand All @@ -519,7 +519,7 @@ class SimpleSelection(Selection):
"""Internal selection class that does not treat the predicate as an input.
"""
_arguments = Selection._arguments
__inputs__ = '_child',
_input_attributes = '_child',


@copydoc(Selection)
Expand Down Expand Up @@ -868,7 +868,7 @@ class Coalesce(Expr):
True
"""
_arguments = 'lhs', 'rhs', 'dshape'
__inputs__ = 'lhs', 'rhs'
_input_attributes = 'lhs', 'rhs'

def __str__(self):
return 'coalesce(%s, %s)' % (self.lhs, self.rhs)
Expand Down
2 changes: 1 addition & 1 deletion blaze/expr/strings.py
Expand Up @@ -250,7 +250,7 @@ class StrCat(ElemWise):
"""
_arguments = 'lhs', 'rhs', 'sep'
__inputs__ = 'lhs', 'rhs'
_input_attributes = 'lhs', 'rhs'

def _dshape(self):
'''
Expand Down

0 comments on commit 27e325f

Please sign in to comment.