Skip to content

Commit 7a32acc

Browse files
author
chris
committed
CLN: Converted formatting in interval.pyx return (pandas-dev#16130)
1 parent a7a0574 commit 7a32acc

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

Diff for: pandas/_libs/interval.pyx

+13-8
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ cdef class Interval(IntervalMixin):
6868
# note: it is faster to just do these checks than to use a special
6969
# constructor (__cinit__/__new__) to avoid them
7070
if closed not in _VALID_CLOSED:
71-
raise ValueError("invalid option for 'closed': %s" % closed)
71+
# raise ValueError("invalid option for 'closed': %s" % closed)
72+
raise ValueError("invalid option for 'closed': {arg1}".format(
73+
arg1=closed))
7274
if not left <= right:
7375
raise ValueError('left side of interval must be <= right side')
7476
self.left = left
@@ -102,8 +104,9 @@ cdef class Interval(IntervalMixin):
102104
else:
103105
op_str = {Py_LT: '<', Py_LE: '<=', Py_GT: '>', Py_GE: '>='}[op]
104106
raise TypeError(
105-
'unorderable types: %s() %s %s()' %
106-
(type(self).__name__, op_str, type(other).__name__))
107+
'unorderable types: {arg1}() {arg2} {arg3}()'.format(
108+
arg1=type(self).__name__, arg2=op_str,
109+
arg3=type(other).__name__))
107110

108111
def __reduce__(self):
109112
args = (self.left, self.right, self.closed)
@@ -123,15 +126,17 @@ cdef class Interval(IntervalMixin):
123126
def __repr__(self):
124127

125128
left, right = self._repr_base()
126-
return ('%s(%r, %r, closed=%r)' %
127-
(type(self).__name__, left, right, self.closed))
129+
return ('{arg1}({arg2!r}, {arg3!r}, closed={arg4!r})'.format(
130+
arg1=type(self).__name__, arg2=left, arg3=right,
131+
arg4=self.closed))
128132

129133
def __str__(self):
130134

131135
left, right = self._repr_base()
132136
start_symbol = '[' if self.closed_left else '('
133137
end_symbol = ']' if self.closed_right else ')'
134-
return '%s%s, %s%s' % (start_symbol, left, right, end_symbol)
138+
return '{arg1}{arg2}, {arg3}{arg4}'.format(arg1=start_symbol,
139+
arg2=left, arg3=right, arg4=end_symbol)
135140

136141
def __add__(self, y):
137142
if isinstance(y, numbers.Number):
@@ -200,8 +205,8 @@ cpdef intervals_to_interval_bounds(ndarray intervals):
200205
continue
201206

202207
if not isinstance(interval, Interval):
203-
raise TypeError("type {} with value {} is not an interval".format(
204-
type(interval), interval))
208+
raise TypeError("type {arg1} with value {arg2} is not an interval".
209+
format(arg1=type(interval), arg2=interval))
205210

206211
left[i] = interval.left
207212
right[i] = interval.right

0 commit comments

Comments
 (0)