Assign clip.preview and clip.show in __init__.py to prevent confusion

Zulko · Jan 13, 2021 · 1048ee8 · 1048ee8
1 parent 5132dd8
commit 1048ee8
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 6 deletions.
diff --git a/moviepy/__init__.py b/moviepy/__init__.py
@@ -18,11 +18,21 @@
 from moviepy.video.io.VideoFileClip import VideoFileClip
 from moviepy.video.io.ImageSequenceClip import ImageSequenceClip
 from moviepy.video.io.downloader import download_webfile
-from moviepy.video.VideoClip import VideoClip, ImageClip, ColorClip, TextClip, BitmapClip
+from moviepy.video.VideoClip import (
+    VideoClip,
+    ImageClip,
+    ColorClip,
+    TextClip,
+    BitmapClip,
+)
 from moviepy.video.compositing.CompositeVideoClip import CompositeVideoClip, clips_array
 from moviepy.video.compositing.concatenate import concatenate_videoclips
 
-from moviepy.audio.AudioClip import AudioClip, CompositeAudioClip, concatenate_audioclips
+from moviepy.audio.AudioClip import (
+    AudioClip,
+    CompositeAudioClip,
+    concatenate_audioclips,
+)
 from moviepy.audio.io.AudioFileClip import AudioFileClip
 
 # FX
@@ -52,6 +62,21 @@
 for name, function in audio_fxs:
     setattr(AudioClip, name, function)
 
+
+def preview(self, *args, **kwargs):
+    """NOT AVAILABLE: clip.preview requires importing from moviepy.editor"""
+    raise ImportError("clip.preview requires importing from moviepy.editor")
+
+
+def show(self, *args, **kwargs):
+    """NOT AVAILABLE: clip.show requires importing from moviepy.editor"""
+    raise ImportError("clip.show requires importing from moviepy.editor")
+
+
+VideoClip.preview = preview
+VideoClip.show = show
+AudioClip.preview = preview
+
 # Cleanup namespace
-del audio_fxs, video_fxs, name, function
+del audio_fxs, video_fxs, name, function, preview, show
 del inspect
diff --git a/moviepy/editor.py b/moviepy/editor.py
@@ -41,11 +41,11 @@ def sliders(*args, **kwargs):
 except ImportError:
 
     def preview(self, *args, **kwargs):
-        """NOT AVAILABLE : clip.preview requires Pygame installed."""
+        """NOT AVAILABLE: clip.preview requires Pygame installed"""
         raise ImportError("clip.preview requires Pygame installed")
 
     def show(self, *args, **kwargs):
-        """NOT AVAILABLE : clip.show requires Pygame installed."""
+        """NOT AVAILABLE: clip.show requires Pygame installed"""
         raise ImportError("clip.show requires Pygame installed")
 
 
@@ -57,7 +57,7 @@ def show(self, *args, **kwargs):
 except ImportError:
 
     def preview(self, *args, **kwargs):
-        """ NOT AVAILABLE : clip.preview requires Pygame installed."""
+        """ NOT AVAILABLE: clip.preview requires Pygame installed"""
         raise ImportError("clip.preview requires Pygame installed")