From 6a3773dc3aa25cfcc5fb9dba22a1eb663f99123c Mon Sep 17 00:00:00 2001 From: luz paz Date: Wed, 21 Jul 2021 22:05:53 -0400 Subject: [PATCH] Fix various typos Found via `codespell -q 3 -S ./CHANGELOG.md -L ba,nd` --- docs/FAQ.rst | 2 +- docs/docker.rst | 2 +- docs/examples/the_end.rst | 2 +- docs/gallery.rst | 6 +++--- docs/getting_started/compositing.rst | 2 +- docs/getting_started/efficient_moviepy.rst | 2 +- docs/getting_started/quick_presentation.rst | 4 ++-- docs/getting_started/videoclips.rst | 4 ++-- docs/ref/code_origanization.rst | 2 +- moviepy/Clip.py | 8 ++++---- moviepy/audio/AudioClip.py | 4 ++-- moviepy/audio/io/ffmpeg_audiowriter.py | 2 +- moviepy/tools.py | 2 +- moviepy/video/VideoClip.py | 2 +- moviepy/video/compositing/CompositeVideoClip.py | 4 ++-- moviepy/video/compositing/concatenate.py | 2 +- moviepy/video/fx/painting.py | 2 +- moviepy/video/fx/resize.py | 2 +- moviepy/video/io/VideoFileClip.py | 2 +- moviepy/video/io/ffmpeg_reader.py | 10 +++++----- moviepy/video/io/gif_writers.py | 2 +- moviepy/video/io/preview.py | 2 +- moviepy/video/tools/cuts.py | 6 +++--- moviepy/video/tools/drawing.py | 10 +++++----- moviepy/video/tools/interpolators.py | 10 +++++----- moviepy/video/tools/subtitles.py | 2 +- moviepy/video/tools/tracking.py | 4 ++-- tests/test_AudioClips.py | 2 +- tests/test_VideoClip.py | 2 +- tests/test_compositing.py | 4 ++-- tests/test_ffmpeg_reader.py | 2 +- tests/test_fx.py | 2 +- tests/test_tools.py | 4 ++-- 33 files changed, 59 insertions(+), 59 deletions(-) diff --git a/docs/FAQ.rst b/docs/FAQ.rst index 2ff04b07e..c92ec508b 100644 --- a/docs/FAQ.rst +++ b/docs/FAQ.rst @@ -3,7 +3,7 @@ FAQ and troubleshooting This section will fill up as MoviePy advances through the next steps of development (currently on the roadmap: MoviePy Studio, MoviePy WebApp, MoviePy OS, MoviePy -Trust Inc., and the MoviePy Charity Fundation). +Trust Inc., and the MoviePy Charity Foundation). Common errors that are not bugs -------------------------------- diff --git a/docs/docker.rst b/docs/docker.rst index 7d5033235..ad394774a 100644 --- a/docs/docker.rst +++ b/docs/docker.rst @@ -1,7 +1,7 @@ Moviepy Docker =============== -Prequisites +Prerequisites ------------- 1. Docker installed `Docker for Mac, Docker for windows, linux, etc `_ diff --git a/docs/examples/the_end.rst b/docs/examples/the_end.rst index e093b0579..fb1fd09a2 100644 --- a/docs/examples/the_end.rst +++ b/docs/examples/the_end.rst @@ -8,7 +8,7 @@ So let's explain this one: there is a clip with "The End" written in the middle, and *above* this clip there is the actual movie. The actual movie has a mask which represents -a white (=opaque) circle on a black (=transparent) background. At the begining, +a white (=opaque) circle on a black (=transparent) background. At the beginning, that circle is so large that you see all the actual movie and you don't see the "The End" clip. Then the circle becomes progressively smaller and as a consequence you see less of the actual movie and more of the "The End" clip. diff --git a/docs/gallery.rst b/docs/gallery.rst index 53473705c..dd55a66b5 100644 --- a/docs/gallery.rst +++ b/docs/gallery.rst @@ -63,7 +63,7 @@ This `vector animations tutorial -It is also possible to combine MoviePy with other graphic librairies like matplotlib, etc. +It is also possible to combine MoviePy with other graphic libraries like matplotlib, etc. 3D animations @@ -111,7 +111,7 @@ Or use `this script `_ to ma Data animations ---------------- -This `data animation tutorial `_ shows how to use MoviePy to animate the different Python vizualization libraries: Mayavi, Vispy, Scikit-image, Matplotlib, etc. +This `data animation tutorial `_ shows how to use MoviePy to animate the different Python visualization libraries: Mayavi, Vispy, Scikit-image, Matplotlib, etc. Scientific or technological projects @@ -147,7 +147,7 @@ Kapwing Rinconcam ---------- -`Rincomcam `_ is a camera which films surfers on the Californian beach of Point Rincon. At the end of each day it cuts together a video, puts it online, and tweets it. Everything is entirely automatized with Python. +`Rincomcam `_ is a camera which films surfers on the Californian beach of Point Rincon. At the end of each day it cuts together a video, puts it online, and tweets it. Everything is entirely automated with Python. MoviePy is used to add transitions, titles and music to the videos. diff --git a/docs/getting_started/compositing.rst b/docs/getting_started/compositing.rst index 134bfdd09..96eff73e3 100644 --- a/docs/getting_started/compositing.rst +++ b/docs/getting_started/compositing.rst @@ -30,7 +30,7 @@ Concatenation is done with the function ``concatenate_videoclips``: :: final_clip.write_videofile("my_concatenation.mp4") -The ``final_clip`` is a clip that plays the clips 1, 2, and 3 one after the other. Note that the clips do not need to be the same size. If they arent's they will all appear centered in a clip large enough to contain the biggest of them, with optionnally a color of your choosing to fill the borders. You have many other options there (see the doc of the function). You can for instance play a transition clip between the clips with the option ``transition=my_clip``. +The ``final_clip`` is a clip that plays the clips 1, 2, and 3 one after the other. Note that the clips do not need to be the same size. If they arent's they will all appear centered in a clip large enough to contain the biggest of them, with optionally a color of your choosing to fill the borders. You have many other options there (see the doc of the function). You can for instance play a transition clip between the clips with the option ``transition=my_clip``. Stacking is done with ``clip_array``: :: diff --git a/docs/getting_started/efficient_moviepy.rst b/docs/getting_started/efficient_moviepy.rst index 33425012e..fc9dae019 100644 --- a/docs/getting_started/efficient_moviepy.rst +++ b/docs/getting_started/efficient_moviepy.rst @@ -64,7 +64,7 @@ Most of the time, just having one frame of the video can tell you if you are doi clip.show and clip.preview """""""""""""""""""""""""""" -The methods ``clip.show`` and ``clip.preview`` enable you to vizualise the clip in a Pygame window. They are the fastest way to preview, as the clips are generated and displayed at the same time, and they can be useful to get the coordinates or colors of pixels. These methods require to have PyGame installed, and to use the ``moviepy.editor`` module. +The methods ``clip.show`` and ``clip.preview`` enable you to visualise the clip in a Pygame window. They are the fastest way to preview, as the clips are generated and displayed at the same time, and they can be useful to get the coordinates or colors of pixels. These methods require to have PyGame installed, and to use the ``moviepy.editor`` module. The method ``clip.show`` enables preview one frame of a clip without having to write it to a file: the following lines display the frame in a PyGame window :: diff --git a/docs/getting_started/quick_presentation.rst b/docs/getting_started/quick_presentation.rst index f4b617a1e..3009ffde5 100644 --- a/docs/getting_started/quick_presentation.rst +++ b/docs/getting_started/quick_presentation.rst @@ -11,8 +11,8 @@ Do I need MoviePy? Here are a few reasons why you may want to edit videos in Python: - You have many videos to process or to compose in a complicated way. -- You want to automatize the creation of videos or GIFs on a web server (Django, Flask, etc.) -- You want to automatize tedious tasks, like title insertions tracking objects, cutting scenes, making end credits, subtitles, etc... +- You want to automate the creation of videos or GIFs on a web server (Django, Flask, etc.) +- You want to automate tedious tasks, like title insertions tracking objects, cutting scenes, making end credits, subtitles, etc... - You want to code your own video effects to do something no existing video editor can. - You want to create animations from images generated by another python library (Matplotlib, Mayavi, Gizeh, scikit-images...) diff --git a/docs/getting_started/videoclips.rst b/docs/getting_started/videoclips.rst index 8b7938a91..9e9948538 100644 --- a/docs/getting_started/videoclips.rst +++ b/docs/getting_started/videoclips.rst @@ -3,7 +3,7 @@ Creating and exporting video clips =================================== -Video and audio clips are the central objects of MoviePy. In this section we present the different sorts of clips, how to create them, and how to write them to a file. For informations on modifying a clip (cuts, effects, etc.), see :ref:`effects`. For how to put clips together see :ref:`CompositeVideoClips` and to see how to preview clips before writing a file, refer to :ref:`efficient`. +Video and audio clips are the central objects of MoviePy. In this section we present the different sorts of clips, how to create them, and how to write them to a file. For information on modifying a clip (cuts, effects, etc.), see :ref:`effects`. For how to put clips together see :ref:`CompositeVideoClips` and to see how to preview clips before writing a file, refer to :ref:`efficient`. The following code summarizes the base clips that you can create with moviepy: :: @@ -189,7 +189,7 @@ There are many options to optimize the quality and size of a gif. Please refer t Note that for editing gifs the best way is to preview them in the notebook as explained here: :ref:`ipython_display` -For examples of use, see `this blog post `_ for informations on making GIFs from video files, and `this other post `_ for GIF animations with vector graphics. +For examples of use, see `this blog post `_ for information on making GIFs from video files, and `this other post `_ for GIF animations with vector graphics. Export images """"""""""""""" diff --git a/docs/ref/code_origanization.rst b/docs/ref/code_origanization.rst index 83153c37a..d83cdae56 100644 --- a/docs/ref/code_origanization.rst +++ b/docs/ref/code_origanization.rst @@ -11,7 +11,7 @@ The folder ``moviepy/`` the classes and modules relative to the video and the au - ``Clip.py`` defines the base object for ``AudioClip`` and ``VideoClip`` and the simple methods that can be used by both, like ``clip.subclip``, ``clip.with_duration``, etc. - Files ``config.py`` and ``config_defaults.py`` store the default paths to the external programs FFMPEG and ImageMagick. -- ``decorators.py`` provides very useful decorators that automatize some tasks, like the fact that some effects, when applied to a clip, should also be applied to it's mask, or to its audio track. +- ``decorators.py`` provides very useful decorators that automate some tasks, like the fact that some effects, when applied to a clip, should also be applied to it's mask, or to its audio track. - ``tools.py`` provides misc. functions that are useful everywhere in the library, like a standardized call to subprocess, a time converter, a standardized way to print messages in the console, etc. - ``editor.py`` is a helper module to easily load and initiate many functionalities of moviepy (see :ref:`efficient` for more details) diff --git a/moviepy/Clip.py b/moviepy/Clip.py index e664d33c2..69eb0d817 100644 --- a/moviepy/Clip.py +++ b/moviepy/Clip.py @@ -220,7 +220,7 @@ def with_start(self, t, change_end=True): change_end : bool optional Indicates if the ``end`` attribute value must be changed accordingly, if possible. If ``change_end=True`` and the clip has a ``duration`` - attribute, the ``end`` atrribute of the clip will be updated to + attribute, the ``end`` attribute of the clip will be updated to ``start + duration``. If ``change_end=False`` and the clip has a ``end`` attribute, the ``duration`` attribute of the clip will be updated to ``end - start``. @@ -277,7 +277,7 @@ def with_duration(self, duration, change_end=True): change_end : bool, optional If ``True``, the ``end`` attribute value of the clip will be adjusted - acordingly to the new duration using ``clip.start + duration``. + accordingly to the new duration using ``clip.start + duration``. """ self.duration = duration @@ -328,7 +328,7 @@ def with_fps(self, fps, change_duration=False): @outplace def with_is_mask(self, is_mask): - """Says wheter the clip is a mask or not. + """Says whether the clip is a mask or not. Parameters ---------- @@ -340,7 +340,7 @@ def with_is_mask(self, is_mask): @outplace def with_memoize(self, memoize): - """Sets wheter the clip should keep the last frame read in memory. + """Sets whether the clip should keep the last frame read in memory. Parameters ---------- diff --git a/moviepy/audio/AudioClip.py b/moviepy/audio/AudioClip.py index 002cd737e..a84efd5ad 100644 --- a/moviepy/audio/AudioClip.py +++ b/moviepy/audio/AudioClip.py @@ -325,14 +325,14 @@ def __init__(self, clips): self.clips = clips self.nchannels = max(clip.nchannels for clip in self.clips) - # self.duration is setted at AudioClip + # self.duration is set at AudioClip duration = None for end in self.ends: if end is None: break duration = max(end, duration or 0) - # self.fps is setted at AudioClip + # self.fps is set at AudioClip fps = None for clip in self.clips: if hasattr(clip, "fps") and isinstance(clip.fps, numbers.Number): diff --git a/moviepy/audio/io/ffmpeg_audiowriter.py b/moviepy/audio/io/ffmpeg_audiowriter.py index f39f24ba4..60c2de508 100644 --- a/moviepy/audio/io/ffmpeg_audiowriter.py +++ b/moviepy/audio/io/ffmpeg_audiowriter.py @@ -130,7 +130,7 @@ def write_frames(self, frames_array): elif "bitrate not specified" in ffmpeg_error: error += ( - "\n\nThe audio export failed, possily because the " + "\n\nThe audio export failed, possibly because the " "bitrate you specified was too high or too low for " "the audio codec." ) diff --git a/moviepy/tools.py b/moviepy/tools.py index 699f7b03b..f8e80e811 100644 --- a/moviepy/tools.py +++ b/moviepy/tools.py @@ -124,7 +124,7 @@ def deprecated_func(*args, **kwargs): return deprecated_func -# Non-exhaustive dictionary to store default informations. +# Non-exhaustive dictionary to store default information. # Any addition is most welcome. # Note that 'gif' is complicated to place. From a VideoFileClip point of view, # it is a video, but from a HTML5 point of view, it is an image. diff --git a/moviepy/video/VideoClip.py b/moviepy/video/VideoClip.py index bb290521e..ac56893c8 100644 --- a/moviepy/video/VideoClip.py +++ b/moviepy/video/VideoClip.py @@ -59,7 +59,7 @@ class VideoClip(Clip): ---------- size - The size of the clip, (width,heigth), in pixels. + The size of the clip, (width,height), in pixels. w, h The width and height of the clip, in pixels. diff --git a/moviepy/video/compositing/CompositeVideoClip.py b/moviepy/video/compositing/CompositeVideoClip.py index b7df16542..cb3c6b711 100644 --- a/moviepy/video/compositing/CompositeVideoClip.py +++ b/moviepy/video/compositing/CompositeVideoClip.py @@ -21,7 +21,7 @@ class CompositeVideoClip(VideoClip): clips A list of videoclips. - Clips with a higher ``layer`` attribute will be dislayed + Clips with a higher ``layer`` attribute will be displayed on top of other clips in a lower layer. If two or more clips share the same ``layer``, then the one appearing latest in ``clips`` will be displayed @@ -183,7 +183,7 @@ def clips_array(array, rows_widths=None, cols_heights=None, bg_color=None): Widths of the different rows in pixels. If ``None``, is set automatically. cols_heights - Heights of the different colums in pixels. If ``None``, is set automatically. + Heights of the different columns in pixels. If ``None``, is set automatically. bg_color Fill color for the masked and unfilled regions. Set to ``None`` for these diff --git a/moviepy/video/compositing/concatenate.py b/moviepy/video/compositing/concatenate.py index 76ea098db..4e28504a2 100644 --- a/moviepy/video/compositing/concatenate.py +++ b/moviepy/video/compositing/concatenate.py @@ -20,7 +20,7 @@ def concatenate_videoclips( There are two methods: - method="chain": will produce a clip that simply outputs - the frames of the succesive clips, without any correction if they are + the frames of the successive clips, without any correction if they are not of the same size of anything. If none of the clips have masks the resulting clip has no mask, else the mask is a concatenation of masks (using completely opaque for clips that don't have masks, obviously). diff --git a/moviepy/video/fx/painting.py b/moviepy/video/fx/painting.py index 8c152e91f..4828c7dd6 100644 --- a/moviepy/video/fx/painting.py +++ b/moviepy/video/fx/painting.py @@ -25,7 +25,7 @@ def painting(clip, saturation=1.4, black=0.006): """ Transforms any photo into some kind of painting. Saturation tells at which point the colors of the result should be - flashy. ``black`` gives the anount of black lines wanted. + flashy. ``black`` gives the amount of black lines wanted. Requires Scikit-image or Scipy installed. """ return clip.image_transform(lambda im: to_painting(im, saturation, black)) diff --git a/moviepy/video/fx/resize.py b/moviepy/video/fx/resize.py index 31d3af4f4..843472cd4 100644 --- a/moviepy/video/fx/resize.py +++ b/moviepy/video/fx/resize.py @@ -142,7 +142,7 @@ def resize(clip, new_size=None, height=None, width=None, apply_to_mask=True): -------- >>> myClip.resize( (460,720) ) # New resolution: (460,720) - >>> myClip.resize(0.6) # width and heigth multiplied by 0.6 + >>> myClip.resize(0.6) # width and height multiplied by 0.6 >>> myClip.resize(width=800) # height computed automatically. >>> myClip.resize(lambda t : 1+0.02*t) # slow swelling of the clip """ diff --git a/moviepy/video/io/VideoFileClip.py b/moviepy/video/io/VideoFileClip.py index f7d6d11f5..1be47cb45 100644 --- a/moviepy/video/io/VideoFileClip.py +++ b/moviepy/video/io/VideoFileClip.py @@ -27,7 +27,7 @@ class VideoFileClip(VideoClip): has_mask: Set this to 'True' if there is a mask included in the videofile. Video files rarely contain masks, but some video codecs enable - that. For istance if you have a MoviePy VideoClip with a mask you + that. For instance if you have a MoviePy VideoClip with a mask you can save it to a videofile with a mask. (see also ``VideoClip.write_videofile`` for more details). diff --git a/moviepy/video/io/ffmpeg_reader.py b/moviepy/video/io/ffmpeg_reader.py index ab2c9037a..21181e807 100644 --- a/moviepy/video/io/ffmpeg_reader.py +++ b/moviepy/video/io/ffmpeg_reader.py @@ -205,7 +205,7 @@ def get_frame(self, t): whenever possible, by moving between adjacent frames. """ # + 1 so that it represents the frame position that it will be - # after the frame is read. This makes the later comparisions easier. + # after the frame is read. This makes the later comparisons easier. pos = self.get_frame_number(t) + 1 # Initialize proc if it is not open @@ -333,12 +333,12 @@ def _reset_state(self): initialization and at the end of the parsing process. """ # could be 2 possible types of metadata: - # - file_metadata: Metadata of the container. Here are the tags setted + # - file_metadata: Metadata of the container. Here are the tags set # by the user using `-metadata` ffmpeg option # - stream_metadata: Metadata for each stream of the container. self._inside_file_metadata = False - # this state is neeeded if `duration_tag_separator == "time="` because + # this state is needed if `duration_tag_separator == "time="` because # execution of ffmpeg decoding the whole file using `-f null -` appends # to the output the blocks "Stream mapping:" and "Output:", which # should be ignored @@ -761,7 +761,7 @@ def ffmpeg_parse_infos( - ``"audio_metadata"`` Note that "video_duration" is slightly smaller than "duration" to avoid - fetching the uncomplete frames at the end, which raises an error. + fetching the incomplete frames at the end, which raises an error. Parameters ---------- @@ -822,4 +822,4 @@ def ffmpeg_parse_infos( raise IsADirectoryError(f"'{filename}' is a directory") elif not os.path.exists(filename): raise FileNotFoundError(f"'{filename}' not found") - raise IOError(f"Error pasing `ffmpeg -i` command output:\n\n{infos}") from exc + raise IOError(f"Error passing `ffmpeg -i` command output:\n\n{infos}") from exc diff --git a/moviepy/video/io/gif_writers.py b/moviepy/video/io/gif_writers.py index d750765a2..b052bcecb 100644 --- a/moviepy/video/io/gif_writers.py +++ b/moviepy/video/io/gif_writers.py @@ -223,7 +223,7 @@ def write_gif( look for the clip's ``fps`` attribute. with_mask : bool, optional - Includes tha mask of the clip in the output (the clip must have a mask + Includes the mask of the clip in the output (the clip must have a mask if this argument is ``True``). program : str, optional diff --git a/moviepy/video/io/preview.py b/moviepy/video/io/preview.py index 1b7e85ba8..30ac4c428 100644 --- a/moviepy/video/io/preview.py +++ b/moviepy/video/io/preview.py @@ -135,7 +135,7 @@ def preview( audio = audio and (clip.audio is not None) if audio: - # the sound will be played in parrallel. We are not + # the sound will be played in parallel. We are not # parralellizing it on different CPUs because it seems that # pygame and openCV already use several cpus it seems. diff --git a/moviepy/video/tools/cuts.py b/moviepy/video/tools/cuts.py index ed393b279..40ff5fca3 100644 --- a/moviepy/video/tools/cuts.py +++ b/moviepy/video/tools/cuts.py @@ -1,4 +1,4 @@ -"""Contains everything that can help automatize the cuts in MoviePy.""" +"""Contains everything that can help automate the cuts in MoviePy.""" from collections import defaultdict @@ -99,7 +99,7 @@ def __eq__(self, other): class FramesMatches(list): """Frames matches inside a set of frames. - You can instanciate it passing a list of FramesMatch objects or + You can instantiate it passing a list of FramesMatch objects or using the class methods ``load`` and ``from_clip``. Parameters @@ -290,7 +290,7 @@ def distance(t1, t2): for t3 in t_F[i + 1 :]: # For all the next times t3, use d(F(t), F(end_time)) to # update the bounds on d(F(t), F(t3)). See if you can - # conclude on wether F(t) and F(t3) match. + # conclude on whether F(t) and F(t3) match. t3t, t2t3 = frame_dict[t3][t], frame_dict[t2][t3] t3t["max"] = min(t3t["max"], dist + t2t3["max"]) t3t["min"] = max(t3t["min"], dist - t2t3["max"], t2t3["min"] - dist) diff --git a/moviepy/video/tools/drawing.py b/moviepy/video/tools/drawing.py index 603df82e8..f702e3fa5 100644 --- a/moviepy/video/tools/drawing.py +++ b/moviepy/video/tools/drawing.py @@ -74,7 +74,7 @@ def color_gradient( Shape of the gradient. Can be either ``"linear"``, ``"bilinear"`` or ``"circular"``. In a linear gradient the color varies in one direction, from point ``p1`` to point ``p2``. In a bilinear gradient it also - varies symetrically from ``p1`` in the other direction. In a circular + varies symmetrically from ``p1`` in the other direction. In a circular gradient it goes from ``color_1`` to ``color_2`` in all directions. radius : float, optional @@ -199,7 +199,7 @@ def color_split( color_2=1.0, gradient_width=0, ): - """Make an image splitted in 2 colored regions. + """Make an image split in 2 colored regions. Returns an array of size ``size`` divided in two regions called 1 and 2 in what follows, and which will have colors color_1 and color_2 @@ -209,11 +209,11 @@ def color_split( ---------- x : int, optional - If provided, the image is splitted horizontally in x, the left + If provided, the image is split horizontally in x, the left region being region 1. y : int, optional - If provided, the image is splitted vertically in y, the top region + If provided, the image is split vertically in y, the top region being region 1. p1, p2: tuple or list, optional @@ -242,7 +242,7 @@ def color_split( >>> # an image with all pixels with y<50 red, the others green >>> color_split(size, x=50, color_1=[255, 0, 0], color_2=[0, 255, 0]) >>> - >>> # An image splitted along an arbitrary line (see below) + >>> # An image split along an arbitrary line (see below) >>> color_split(size, p1=[20, 50], p2=[25, 70] color_1=0, color_2=1) """ if gradient_width or ((x is None) and (y is None)): diff --git a/moviepy/video/tools/interpolators.py b/moviepy/video/tools/interpolators.py index 4723e88d4..83db3be3d 100644 --- a/moviepy/video/tools/interpolators.py +++ b/moviepy/video/tools/interpolators.py @@ -18,7 +18,7 @@ class Interpolator: ttss : list, optional Lists of time frames and their correspondients values for the interpolator. This argument can be used instead of ``tt`` and ``ss`` - to instanciate the interpolator using an unique argument. + to instantiate the interpolator using an unique argument. left : float, optional Value to return when ``t < tt[0]``. @@ -30,10 +30,10 @@ class Interpolator: Examples -------- - >>> # instanciate using `tt` and `ss` + >>> # instantiate using `tt` and `ss` >>> interpolator = Interpolator(tt=[0, 1, 2], ss=[3, 4, 5]) >>> - >>> # instanciate using `ttss` + >>> # instantiate using `ttss` >>> interpolator = Interpolator(ttss=[[0, 3], [1, 4], [2, 5]]) # [t, value] """ @@ -64,7 +64,7 @@ class Trajectory: """Trajectory compound by time frames and (x, y) pixels. It's designed as an interpolator, so you can get the position at a given - time ``t``. You can instanciate it from a file using the methods + time ``t``. You can instantiate it from a file using the methods ``from_file`` and ``load_list``. @@ -173,7 +173,7 @@ def to_file(self, filename): @staticmethod def from_file(filename): - """Instanciates an object of Trajectory using a data text file. + """Instantiates an object of Trajectory using a data text file. Parameters ---------- diff --git a/moviepy/video/tools/subtitles.py b/moviepy/video/tools/subtitles.py index 80c3e49b2..b2a9b841f 100644 --- a/moviepy/video/tools/subtitles.py +++ b/moviepy/video/tools/subtitles.py @@ -148,7 +148,7 @@ def to_srt(sub_element): return "\n\n".join(to_srt(sub) for sub in self.subtitles) def match_expr(self, expr): - """Matchs a regular expression against the subtitles of the clip.""" + """Matches a regular expression against the subtitles of the clip.""" return SubtitlesClip( [sub for sub in self.subtitles if re.findall(expr, sub[1]) != []] ) diff --git a/moviepy/video/tools/tracking.py b/moviepy/video/tools/tracking.py index 307cd7b13..8546074bc 100644 --- a/moviepy/video/tools/tracking.py +++ b/moviepy/video/tools/tracking.py @@ -185,7 +185,7 @@ def autoTrack(clip, pattern, tt=None, fps=None, radius=20, xy0=None): ``fps``. This algorithm assumes that the pattern's aspect does not vary much and - that the distance between two occurences of the pattern in two consecutive + that the distance between two occurrences of the pattern in two consecutive frames is smaller than ``radius`` (if you set ``radius`` to -1 the pattern will be searched in the whole screen at each frame). You can also provide the original position of the pattern with xy0. @@ -207,7 +207,7 @@ def autoTrack(clip, pattern, tt=None, fps=None, radius=20, xy0=None): Overwrites fps value used computing time frames. As default, clip's fps. radius : int, optional - Maximum radius to search looking for the pattern. Setted to ``-1``, + Maximum radius to search looking for the pattern. Set to ``-1``, the pattern will be searched in the whole screen at each frame. xy0 : tuple or list, optional diff --git a/tests/test_AudioClips.py b/tests/test_AudioClips.py index 1039f30d7..67865d74b 100644 --- a/tests/test_AudioClips.py +++ b/tests/test_AudioClips.py @@ -76,7 +76,7 @@ def test_concatenate_audioclips_CompositeAudioClip(): - Duration is the sum of their durations. - Ends are the accumulated sum of their durations. - Starts are the accumulated sum of their durations, but first start is 0 - and lastest is ignored. + and latest is ignored. - Channels are the max channels of their clips. """ frequencies = [440, 880, 1760] diff --git a/tests/test_VideoClip.py b/tests/test_VideoClip.py index 56c852548..192e0e52a 100644 --- a/tests/test_VideoClip.py +++ b/tests/test_VideoClip.py @@ -252,7 +252,7 @@ def test_oncolor(util): on_color_clip.write_videofile(location, fps=24) assert os.path.isfile(location) - # test constructor with default arguements + # test constructor with default arguments clip = ColorClip(size=(100, 60), is_mask=True) clip = ColorClip(size=(100, 60), is_mask=False) diff --git a/tests/test_compositing.py b/tests/test_compositing.py index 8f9c5d5e8..58240347f 100644 --- a/tests/test_compositing.py +++ b/tests/test_compositing.py @@ -134,7 +134,7 @@ def test_slide_in(): if t: assert n_reds_expected - if n_reds_expected == 7: # skip 7 due to innacurate frame + if n_reds_expected == 7: # skip 7 due to inaccurate frame continue for r, g, b in new_clip.get_frame(t)[0]: @@ -158,7 +158,7 @@ def test_slide_in(): if t: assert n_reds_expected - if n_reds_expected == 7: # skip 7 due to innacurate frame + if n_reds_expected == 7: # skip 7 due to inaccurate frame continue for row in new_clip.get_frame(t): diff --git a/tests/test_ffmpeg_reader.py b/tests/test_ffmpeg_reader.py index 1281d1b54..da40ef517 100644 --- a/tests/test_ffmpeg_reader.py +++ b/tests/test_ffmpeg_reader.py @@ -596,7 +596,7 @@ def test_seeking_beyond_file_end(): assert reader.pos == 6 # Try again with a jump larger than 100 frames - # (which triggers different behaivour in `.get_frame()` + # (which triggers different behaviour in `.get_frame()` reader = FFMPEG_VideoReader("media/big_buck_bunny_0_30.webm") frame_1 = reader.get_frame(0) diff --git a/tests/test_fx.py b/tests/test_fx.py index 99cf7313a..4da6050e5 100644 --- a/tests/test_fx.py +++ b/tests/test_fx.py @@ -1458,7 +1458,7 @@ def test_audio_delay(stereo_wave, duration, offset, n_repeats, decay): """ # limits of this test assert n_repeats > 0 # some repetition, if not does not make sense - assert duration <= offset # avoid wave distorsion + assert duration <= offset # avoid wave distortion assert not offset * 1000000 % 2 # odd offset -> no accurate muted chunk size # stereo audio clip diff --git a/tests/test_tools.py b/tests/test_tools.py index ca5883b80..86db60fe2 100644 --- a/tests/test_tools.py +++ b/tests/test_tools.py @@ -51,7 +51,7 @@ def test_find_extensions_not_found(): ], ) def test_cvsecs(given, expected): - """Test the convert_to_seconds funtion outputs correct times as per + """Test the convert_to_seconds function outputs correct times as per the docstring. """ assert tools.convert_to_seconds(given) == expected @@ -292,7 +292,7 @@ def test_decorators_argument_converters_consistency( >>> def whatever_function(bar): # bar not converted to seconds ... pass - Some wrong defintions remained unnoticed in the past before this test was + Some wrong definitions remained unnoticed in the past before this test was added. """ with contextlib.redirect_stdout(io.StringIO()):