[pitivi] Explicitly call supers
- From: Alexandru Băluț <alexbalut src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] Explicitly call supers
- Date: Sat, 16 Apr 2016 14:10:06 +0000 (UTC)
commit 08dc01f9c66e30f8c069cd62d8d669ffd16f55b1
Author: Alexandru Băluț <alexandru balut gmail com>
Date: Sat Apr 16 11:12:21 2016 +0200
Explicitly call supers
Differential Revision: https://phabricator.freedesktop.org/D910
pitivi/check.py | 3 ++-
pitivi/timeline/elements.py | 24 ++++++++++++------------
pitivi/timeline/layer.py | 4 ++--
pitivi/timeline/previewers.py | 4 ++--
pitivi/timeline/timeline.py | 4 ++--
pitivi/utils/pipeline.py | 4 ++--
6 files changed, 22 insertions(+), 21 deletions(-)
---
diff --git a/pitivi/check.py b/pitivi/check.py
index b585255..ba97e12 100644
--- a/pitivi/check.py
+++ b/pitivi/check.py
@@ -121,9 +121,10 @@ class Dependency(object):
class GIDependency(Dependency):
+
def __init__(self, modulename, apiversion, version_required_string=None, additional_message=None):
self.__api_version = apiversion
- super(GIDependency, self).__init__(modulename, version_required_string, additional_message)
+ Dependency.__init__(self, modulename, version_required_string, additional_message)
def _try_importing_component(self):
try:
diff --git a/pitivi/timeline/elements.py b/pitivi/timeline/elements.py
index 8af3925..08904f7 100644
--- a/pitivi/timeline/elements.py
+++ b/pitivi/timeline/elements.py
@@ -373,7 +373,7 @@ class TimelineElement(Gtk.Layout, timelineUtils.Zoomable, Loggable):
}
def __init__(self, element, timeline):
- super(TimelineElement, self).__init__()
+ Gtk.Layout.__init__(self)
timelineUtils.Zoomable.__init__(self)
Loggable.__init__(self)
@@ -580,7 +580,7 @@ class TimelineElement(Gtk.Layout, timelineUtils.Zoomable, Loggable):
class VideoBackground(Gtk.Box):
def __init__(self):
- super(VideoBackground, self).__init__(self)
+ Gtk.Box.__init__(self)
self.get_style_context().add_class("VideoBackground")
@@ -607,7 +607,7 @@ class VideoUriSource(VideoSource):
__gtype_name__ = "PitiviUriVideoSource"
def __init__(self, element, timeline):
- super(VideoUriSource, self).__init__(element, timeline)
+ VideoSource.__init__(self, element, timeline)
self.get_style_context().add_class("VideoUriSource")
def _getPreviewer(self):
@@ -625,7 +625,7 @@ class VideoUriSource(VideoSource):
class AudioBackground(Gtk.Box):
def __init__(self):
- super(AudioBackground, self).__init__(self)
+ Gtk.Box.__init__(self)
self.get_style_context().add_class("AudioBackground")
@@ -634,7 +634,7 @@ class AudioUriSource(TimelineElement):
__gtype_name__ = "PitiviAudioUriSource"
def __init__(self, element, timeline):
- super(AudioUriSource, self).__init__(element, timeline)
+ TimelineElement.__init__(self, element, timeline)
self.get_style_context().add_class("AudioUriSource")
def _getPreviewer(self):
@@ -705,7 +705,7 @@ class Clip(Gtk.EventBox, timelineUtils.Zoomable, Loggable):
__gtype_name__ = "PitiviClip"
def __init__(self, layer, ges_clip):
- super(Clip, self).__init__()
+ Gtk.EventBox.__init__(self)
timelineUtils.Zoomable.__init__(self)
Loggable.__init__(self)
@@ -991,7 +991,7 @@ class SourceClip(Clip):
__gtype_name__ = "PitiviSourceClip"
def __init__(self, layer, ges_clip):
- super(SourceClip, self).__init__(layer, ges_clip)
+ Clip.__init__(self, layer, ges_clip)
def _setupWidget(self):
self._addTrimHandles()
@@ -1008,7 +1008,7 @@ class UriClip(SourceClip):
__gtype_name__ = "PitiviUriClip"
def __init__(self, layer, ges_clip):
- super(UriClip, self).__init__(layer, ges_clip)
+ SourceClip.__init__(self, layer, ges_clip)
self.props.has_tooltip = True
self.set_tooltip_markup(misc.filename_from_uri(ges_clip.get_uri()))
@@ -1020,7 +1020,7 @@ class UriClip(SourceClip):
return True
def _childAdded(self, clip, child):
- super(UriClip, self)._childAdded(clip, child)
+ SourceClip._childAdded(self, clip, child)
if isinstance(child, GES.Source):
if child.get_track_type() == GES.TrackType.AUDIO:
@@ -1039,7 +1039,7 @@ class TitleClip(SourceClip):
__gtype_name__ = "PitiviTitleClip"
def _childAdded(self, clip, child):
- super(TitleClip, self)._childAdded(clip, child)
+ SourceClip._childAdded(self, clip, child)
if isinstance(child, GES.Source):
if child.get_track_type() == GES.TrackType.VIDEO:
@@ -1056,7 +1056,7 @@ class TransitionClip(Clip):
def __init__(self, layer, ges_clip):
self.__has_video = False
- super(TransitionClip, self).__init__(layer, ges_clip)
+ Clip.__init__(self, layer, ges_clip)
if self.__has_video:
self.z_order = 1
@@ -1080,7 +1080,7 @@ class TransitionClip(Clip):
return True
def _childAdded(self, clip, child):
- super(TransitionClip, self)._childAdded(clip, child)
+ Clip._childAdded(self, clip, child)
if isinstance(child, GES.VideoTransition):
self.z_order = 1
diff --git a/pitivi/timeline/layer.py b/pitivi/timeline/layer.py
index b42b6d0..f17ebc9 100644
--- a/pitivi/timeline/layer.py
+++ b/pitivi/timeline/layer.py
@@ -290,7 +290,7 @@ class LayerLayout(Gtk.Layout, Loggable):
__gtype_name__ = "PitiviLayerLayout"
def __init__(self, timeline):
- super(LayerLayout, self).__init__()
+ Gtk.Layout.__init__(self)
Loggable.__init__(self)
self._children = []
@@ -351,7 +351,7 @@ class Layer(Gtk.EventBox, timelineUtils.Zoomable, Loggable):
}
def __init__(self, ges_layer, timeline):
- super(Layer, self).__init__()
+ Gtk.EventBox.__init__(self)
Loggable.__init__(self)
self.ges_layer = ges_layer
diff --git a/pitivi/timeline/previewers.py b/pitivi/timeline/previewers.py
index 67bee0a..3e457f8 100644
--- a/pitivi/timeline/previewers.py
+++ b/pitivi/timeline/previewers.py
@@ -354,7 +354,7 @@ class Previewer(Gtk.Layout):
"""
@param track_type : GES.TrackType.*
"""
- super(Previewer, self).__init__()
+ Gtk.Layout.__init__(self)
self.track_type = track_type
@@ -751,7 +751,7 @@ class Thumbnail(Gtk.Image):
Simple widget representing a Thumbnail
"""
def __init__(self, width, height):
- super(Thumbnail, self).__init__()
+ Gtk.Image.__init__(self)
self.width = width
self.height = height
self.props.width_request = self.width
diff --git a/pitivi/timeline/timeline.py b/pitivi/timeline/timeline.py
index f309e05..b9d6b45 100644
--- a/pitivi/timeline/timeline.py
+++ b/pitivi/timeline/timeline.py
@@ -108,7 +108,7 @@ class VerticalBar(Gtk.DrawingArea, Loggable):
__gtype_name__ = "PitiviVerticalBar"
def __init__(self, css_class):
- super(VerticalBar, self).__init__()
+ Gtk.DrawingArea.__init__(self)
Loggable.__init__(self)
self.get_style_context().add_class(css_class)
@@ -135,7 +135,7 @@ class Marquee(Gtk.Box, Loggable):
@timeline: The #Timeline on which the marquee will
be used
"""
- super(Marquee, self).__init__()
+ Gtk.Box.__init__(self)
Loggable.__init__(self)
self._timeline = timeline
diff --git a/pitivi/utils/pipeline.py b/pitivi/utils/pipeline.py
index 285428f..b6d5332 100644
--- a/pitivi/utils/pipeline.py
+++ b/pitivi/utils/pipeline.py
@@ -642,7 +642,7 @@ class Pipeline(GES.Pipeline, SimplePipeline):
self._timeline.commit()
self._commit_wanted = False
else:
- super(Pipeline, self)._busMessageCb(bus, message)
+ SimplePipeline._busMessageCb(self, bus, message)
def commit_timeline(self):
if self._waiting_for_async_done and not self._was_empty\
@@ -660,7 +660,7 @@ class Pipeline(GES.Pipeline, SimplePipeline):
self._was_empty = False
def setState(self, state):
- super(Pipeline, self).setState(state)
+ SimplePipeline.setState(self, state)
if state >= Gst.State.PAUSED and self._timeline.is_empty():
self.debug("No ASYNC_DONE will be emited on empty timelines")
self._was_empty = True
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]