From 880fcc7dad71443c2db15573e19f57448543f930 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Sat, 1 Sep 2012 17:09:41 -0400 Subject: [PATCH] gallery.py: restore `*args` handling in _ogv() and ._mp4(). This was broken by an overly exuberant: commit 6506f908b65778cb17ef200560c2873babeb48b6 Author: W. Trevor King Date: Sun Aug 12 18:53:00 2012 -0400 Pass stream into ._error() calls in gallery.py. Avoids 502 errors when ._response() tries to .write() when stream is None. --- posts/gallery/gallery.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/posts/gallery/gallery.py b/posts/gallery/gallery.py index 7d44b77..cac2ea6 100755 --- a/posts/gallery/gallery.py +++ b/posts/gallery/gallery.py @@ -351,7 +351,7 @@ class CGIGalleryServer (object): thumb_path]) return (thumb_path, self._url(thumb_url)) - def _mp4(self, video): + def _mp4(self, video, *args): if not video.endswith('.mov'): raise HTTPError(404, "can't translate {} to MPEGv4".format(video)) dirname,filename = _os_path.split(video) @@ -375,7 +375,7 @@ class CGIGalleryServer (object): invoke(arg) return (mp4_path, self._url(mp4_url)) - def _ogv(self, video, stream=None): + def _ogv(self, video, *args): if not video.endswith('.mov'): LOG.error("can't translate {} to Ogg Video".format(video)) dirname,filename = _os_path.split(video) -- 2.26.2