aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoris Bobrov <breton@cynicmansion.ru>2015-12-21 02:45:22 +0300
committerBoris Bobrov <breton@cynicmansion.ru>2015-12-21 02:45:22 +0300
commit355d062dd4e35409af92e136666baf211161b7cb (patch)
tree5f7cf90ae35a2b39e50cff73be5cf6a7d457203a
parentca3dd10e2b988ec4e3e81c70aaaf0ba97ed196eb (diff)
downloadmediagoblin-355d062dd4e35409af92e136666baf211161b7cb.tar.lz
mediagoblin-355d062dd4e35409af92e136666baf211161b7cb.tar.xz
mediagoblin-355d062dd4e35409af92e136666baf211161b7cb.zip
Work around pbutils import warning bug (5066)
-rw-r--r--mediagoblin/media_types/tools.py4
-rw-r--r--mediagoblin/media_types/video/transcoders.py4
2 files changed, 6 insertions, 2 deletions
diff --git a/mediagoblin/media_types/tools.py b/mediagoblin/media_types/tools.py
index 3bc56e2c..602b9605 100644
--- a/mediagoblin/media_types/tools.py
+++ b/mediagoblin/media_types/tools.py
@@ -35,8 +35,10 @@ def discover(src):
# import, or an exception will be raised.
import gi
gi.require_version('Gst', '1.0')
- from gi.repository import GObject, Gst, GstPbutils, GLib
+ from gi.repository import GObject, Gst, GLib
Gst.init(None)
+ # init before import to work around https://bugzilla.gnome.org/show_bug.cgi?id=736260
+ from gi.repository import GstPbutils
_log.info('Discovering {0}...'.format(src))
uri = 'file://{0}'.format(src)
diff --git a/mediagoblin/media_types/video/transcoders.py b/mediagoblin/media_types/video/transcoders.py
index f8020497..f4b0341e 100644
--- a/mediagoblin/media_types/video/transcoders.py
+++ b/mediagoblin/media_types/video/transcoders.py
@@ -31,8 +31,10 @@ sys.argv = []
import gi
gi.require_version('Gst', '1.0')
-from gi.repository import GObject, Gst, GstPbutils
+from gi.repository import GObject, Gst
Gst.init(None)
+# init before import to work around https://bugzilla.gnome.org/show_bug.cgi?id=736260
+from gi.repository import GstPbutils
sys.argv = old_argv
import struct