Skip to content
This repository was archived by the owner on Jan 13, 2024. It is now read-only.

Commit af30336

Browse files
author
DirectiveAthena
committed
Change: Better TypeHinting
1 parent b7d5c53 commit af30336

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

src/AthenaColor/Objects/Color/ColorSystem.py

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
# - Support Methods -
2626
# ----------------------------------------------------------------------------------------------------------------------
2727
def _ColorConversionInput(fnc):
28-
def wrapper(self,other):
28+
def wrapper(self,other:ColorSystem|int|tuple):
2929
try:
30-
return fnc(self, color_conversions_mapped[type(self)][type(other)](other),)
30+
return fnc(self, color_conversions_mapped[type(self)][type(other)](other))
3131
except KeyError:
3232
return NotImplemented
3333
return wrapper
@@ -89,50 +89,50 @@ def __divmod__(self, other: tuple) -> tuple:
8989
# it will convert the right-hand object to the same type as the left-hand type.
9090

9191
@ _ColorConversionInput
92-
def __add__(self, other: tuple) -> ColorSystem:
92+
def __add__(self, other: ColorSystem|int|tuple) -> ColorSystem:
9393
return self.__class__(*CSD.add(self.export(), other))
9494
@ _ColorConversionInput
95-
def __sub__(self, other: tuple) -> ColorSystem:
95+
def __sub__(self, other: ColorSystem|int|tuple) -> ColorSystem:
9696
return self.__class__(*CSD.sub(self.export(), other))
9797
@ _ColorConversionInput
98-
def __mul__(self, other: tuple) -> ColorSystem:
98+
def __mul__(self, other: ColorSystem|int|tuple) -> ColorSystem:
9999
return self.__class__(*CSD.mul(self.export(), other))
100100
@ _ColorConversionInput
101-
def __floordiv__(self, other: tuple) -> ColorSystem:
101+
def __floordiv__(self, other: ColorSystem|int|tuple) -> ColorSystem:
102102
return self.__class__(*CSD.floordiv(self.export(), other))
103103
@ _ColorConversionInput
104-
def __truediv__(self, other: tuple) -> ColorSystem:
104+
def __truediv__(self, other: ColorSystem|int|tuple) -> ColorSystem:
105105
return self.__class__(*CSD.truediv(self.export(), other))
106106
@ _ColorConversionInput
107-
def __mod__(self, other: tuple) -> ColorSystem:
107+
def __mod__(self, other: ColorSystem|int|tuple) -> ColorSystem:
108108
return self.__class__(*CSD.mod(self.export(), other))
109109
@ _ColorConversionInput
110-
def __pow__(self, other: tuple) -> ColorSystem:
110+
def __pow__(self, other: ColorSystem|int|tuple) -> ColorSystem:
111111
return self.__class__(*CSD.power(self.export(), other))
112112

113113
@ _ColorConversionInput
114-
def __iadd__(self, other: tuple) -> ColorSystem:
114+
def __iadd__(self, other: ColorSystem|int|tuple) -> ColorSystem:
115115
return self._value_setter(CSD.add(self.export(), other))
116116
@ _ColorConversionInput
117-
def __isub__(self, other: tuple) -> ColorSystem:
117+
def __isub__(self, other: ColorSystem|int|tuple) -> ColorSystem:
118118
return self._value_setter(CSD.sub(self.export(), other))
119119
@ _ColorConversionInput
120-
def __imul__(self, other: tuple) -> ColorSystem:
120+
def __imul__(self, other: ColorSystem|int|tuple) -> ColorSystem:
121121
return self._value_setter(CSD.mul(self.export(), other))
122122
@ _ColorConversionInput
123-
def __ifloordiv__(self, other: tuple) -> ColorSystem:
123+
def __ifloordiv__(self, other: ColorSystem|int|tuple) -> ColorSystem:
124124
return self._value_setter(CSD.floordiv(self.export(), other))
125125
@ _ColorConversionInput
126-
def __itruediv__(self, other: tuple) -> ColorSystem:
126+
def __itruediv__(self, other: ColorSystem|int|tuple) -> ColorSystem:
127127
return self._value_setter(CSD.truediv(self.export(), other))
128128
@ _ColorConversionInput
129-
def __itruediv__(self, other: tuple) -> ColorSystem:
129+
def __itruediv__(self, other: ColorSystem|int|tuple) -> ColorSystem:
130130
return self._value_setter(CSD.truediv(self.export(), other))
131131
@ _ColorConversionInput
132-
def __imod__(self, other: tuple) -> ColorSystem:
132+
def __imod__(self, other: ColorSystem|int|tuple) -> ColorSystem:
133133
return self._value_setter(CSD.mod(self.export(), other))
134134
@ _ColorConversionInput
135-
def __ipow__(self, other: tuple) -> ColorSystem:
135+
def __ipow__(self, other: ColorSystem|int|tuple) -> ColorSystem:
136136
return self._value_setter(CSD.power(self.export(), other))
137137

138138
# ------------------------------------------------------------------------------------------------------------------
@@ -247,25 +247,25 @@ def __divmod__(self, other: tuple) -> tuple:
247247
# - Math Dunders -
248248
# ------------------------------------------------------------------------------------------------------------------
249249
@ _ColorConversionInput
250-
def __add__(self, other: tuple) -> ColorSystem:
250+
def __add__(self, other: ColorSystem|int|tuple) -> ColorSystem:
251251
return self.__class__(rgb_to_hex(*CSD.add(self.export(), other)))
252252
@ _ColorConversionInput
253-
def __sub__(self, other: tuple) -> ColorSystem:
253+
def __sub__(self, other: ColorSystem|int|tuple) -> ColorSystem:
254254
return self.__class__(rgb_to_hex(*CSD.sub(self.export(), other)))
255255
@ _ColorConversionInput
256-
def __mul__(self, other: tuple) -> ColorSystem:
256+
def __mul__(self, other: ColorSystem|int|tuple) -> ColorSystem:
257257
return self.__class__(rgb_to_hex(*CSD.mul(self.export(), other)))
258258
@ _ColorConversionInput
259-
def __floordiv__(self, other: tuple) -> ColorSystem:
259+
def __floordiv__(self, other: ColorSystem|int|tuple) -> ColorSystem:
260260
return self.__class__(rgb_to_hex(*CSD.floordiv(self.export(), other)))
261261
@ _ColorConversionInput
262-
def __truediv__(self, other: tuple) -> ColorSystem:
262+
def __truediv__(self, other: ColorSystem|int|tuple) -> ColorSystem:
263263
return self.__class__(rgb_to_hex(*CSD.truediv(self.export(), other)))
264264
@ _ColorConversionInput
265-
def __mod__(self, other: tuple) -> ColorSystem:
265+
def __mod__(self, other: ColorSystem|int|tuple) -> ColorSystem:
266266
return self.__class__(rgb_to_hex(*CSD.mod(self.export(), other)))
267267
@ _ColorConversionInput
268-
def __pow__(self, other: tuple) -> ColorSystem:
268+
def __pow__(self, other: ColorSystem|int|tuple) -> ColorSystem:
269269
return self.__class__(rgb_to_hex(*CSD.power(self.export(), other)))
270270

271271
# ------------------------------------------------------------------------------------------------------------------
@@ -362,25 +362,25 @@ def __divmod__(self, other: tuple) -> tuple:
362362
# - Math Dunders -
363363
# ------------------------------------------------------------------------------------------------------------------
364364
@ _ColorConversionInput
365-
def __add__(self, other: tuple) -> ColorSystem:
365+
def __add__(self, other: ColorSystem|int|tuple) -> ColorSystem:
366366
return self.__class__(rgba_to_hexa(*CSD.add(self.export(), other)))
367367
@ _ColorConversionInput
368-
def __sub__(self, other: tuple) -> ColorSystem:
368+
def __sub__(self, other: ColorSystem|int|tuple) -> ColorSystem:
369369
return self.__class__(rgba_to_hexa(*CSD.sub(self.export(), other)))
370370
@ _ColorConversionInput
371-
def __mul__(self, other: tuple) -> ColorSystem:
371+
def __mul__(self, other: ColorSystem|int|tuple) -> ColorSystem:
372372
return self.__class__(rgba_to_hexa(*CSD.mul(self.export(), other)))
373373
@ _ColorConversionInput
374-
def __floordiv__(self, other: tuple) -> ColorSystem:
374+
def __floordiv__(self, other: ColorSystem|int|tuple) -> ColorSystem:
375375
return self.__class__(rgba_to_hexa(*CSD.floordiv(self.export(), other)))
376376
@ _ColorConversionInput
377-
def __truediv__(self, other: tuple) -> ColorSystem:
377+
def __truediv__(self, other: ColorSystem|int|tuple) -> ColorSystem:
378378
return self.__class__(rgba_to_hexa(*CSD.truediv(self.export(), other)))
379379
@ _ColorConversionInput
380-
def __mod__(self, other: tuple) -> ColorSystem:
380+
def __mod__(self, other: ColorSystem|int|tuple) -> ColorSystem:
381381
return self.__class__(rgba_to_hexa(*CSD.mod(self.export(), other)))
382382
@ _ColorConversionInput
383-
def __pow__(self, other: tuple) -> ColorSystem:
383+
def __pow__(self, other: ColorSystem|int|tuple) -> ColorSystem:
384384
return self.__class__(rgba_to_hexa(*CSD.power(self.export(), other)))
385385

386386
# ------------------------------------------------------------------------------------------------------------------

0 commit comments

Comments
 (0)