opensource/manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-07-31 05:52:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Modernize Python 2 code to get ready for Python 3 yet again

Browse Source
This commit is contained in:
cclauss
2018-06-02 08:59:26 -04:00
parent 1d23a01a3a
commit f03268d007
121 changed files with 773 additions and 698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
animation/transform.py
View File

@ -116,7 +116,7 @@ class ApplyMethod(Transform):
"Whoops, looks like you accidentally invoked " +
"the method you want to animate"
)
assert(isinstance(method.im_self, Mobject))
assert(isinstance(method.__self__, Mobject))
args = list(args) # So that args.pop() works
if "method_kwargs" in kwargs:
method_kwargs = kwargs["method_kwargs"]
@ -124,9 +124,9 @@ class ApplyMethod(Transform):
method_kwargs = args.pop()
else:
method_kwargs = {}
target = method.im_self.copy()
method.im_func(target, *args, **method_kwargs)
Transform.__init__(self, method.im_self, target, **kwargs)
target = method.__self__.copy()
method.__func__(target, *args, **method_kwargs)
Transform.__init__(self, method.__self__, target, **kwargs)
class ApplyPointwiseFunction(ApplyMethod):
@ -182,7 +182,7 @@ class ApplyMatrix(ApplyPointwiseFunction):
new_matrix[:2, :2] = matrix
matrix = new_matrix
elif matrix.shape != (3, 3):
raise "Matrix has bad dimensions"
raise Exception("Matrix has bad dimensions")
transpose = np.transpose(matrix)
def func(p):
@ -198,7 +198,7 @@ class ComplexFunction(ApplyPointwiseFunction):
)
ApplyPointwiseFunction.__init__(
self,
lambda (x, y, z): complex_to_R3(function(complex(x, y))),
lambda x_y_z: complex_to_R3(function(complex(x_y_z[0], x_y_z[1]))),
instantiate(mobject),
**kwargs
)