[pitivi: 33/36] Remove all trailling spaces
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi: 33/36] Remove all trailling spaces
- Date: Sun, 22 May 2011 20:34:15 +0000 (UTC)
commit 53f0bc4092bfa8aae3030113df89f11592630f8c
Author: Thibault Saunier <thibault saunier collabora co uk>
Date: Fri May 20 17:24:32 2011 -0400
Remove all trailling spaces
pitivi/actioner.py | 2 +-
pitivi/formatters/etree.py | 2 +-
pitivi/timeline/timeline_undo.py | 2 +-
pitivi/timeline/track.py | 4 +-
pitivi/ui/curve.py | 10 +++---
pitivi/ui/dynamic.py | 10 +++---
pitivi/ui/encodingdialog.py | 4 +-
pitivi/ui/prefs.py | 2 +-
pitivi/ui/preset.py | 2 +-
pitivi/ui/previewer.py | 2 +-
pitivi/ui/projectsettings.py | 14 ++++----
pitivi/ui/ripple_update_group.py | 6 ++--
pitivi/ui/timeline.py | 4 +-
pitivi/ui/viewer.py | 2 +-
tests/test_binary_search.py | 8 ++--
tests/test_cache.py | 2 +-
tests/test_etree_formatter.py | 2 +-
tests/test_factories_base.py | 2 +-
tests/test_factories_file.py | 2 +-
tests/test_factories_operation.py | 2 +-
tests/test_gap.py | 2 +-
tests/test_integration.py | 66 ++++++++++++++++++------------------
tests/test_signallable.py | 2 +-
tests/test_transitions.py | 14 ++++----
tests/testcomplex.py | 2 +-
win32/setup.py | 28 ++++++++--------
26 files changed, 99 insertions(+), 99 deletions(-)
---
diff --git a/pitivi/actioner.py b/pitivi/actioner.py
index b7c8882..59123df 100644
--- a/pitivi/actioner.py
+++ b/pitivi/actioner.py
@@ -224,7 +224,7 @@ class Renderer(Actioner):
a = RenderAction()
a.addProducers(*sources)
a.addConsumers(sf)
-
+
return a
def _connectFunctions(self):
diff --git a/pitivi/formatters/etree.py b/pitivi/formatters/etree.py
index 2926ab0..1e8bf71 100644
--- a/pitivi/formatters/etree.py
+++ b/pitivi/formatters/etree.py
@@ -476,7 +476,7 @@ class ElementTreeFormatter(Formatter):
interpolator.start.mode = int(start.attrib["mode"])
for kf in element.getiterator("keyframe"):
- interpolator.newKeyframe(long(kf.attrib["time"]),
+ interpolator.newKeyframe(long(kf.attrib["time"]),
value=self._parsePropertyValue(kf.attrib["value"]),
mode=int(kf.attrib["mode"]))
end = element.find("end")
diff --git a/pitivi/timeline/timeline_undo.py b/pitivi/timeline/timeline_undo.py
index f960a52..5f54771 100644
--- a/pitivi/timeline/timeline_undo.py
+++ b/pitivi/timeline/timeline_undo.py
@@ -440,7 +440,7 @@ class TimelineLogObserver(object):
if isinstance(track_object, TrackEffect):
action = self.trackEffectAddAction(timeline_object, track_object,
self.effect_properties_tracker)
- #We use the action instead of the track object
+ #We use the action instead of the track object
#because the track_object changes when redoing
track_object.connect("active-changed",
self._trackObjectActiveChangedCb, action)
diff --git a/pitivi/timeline/track.py b/pitivi/timeline/track.py
index d0cc212..894e068 100644
--- a/pitivi/timeline/track.py
+++ b/pitivi/timeline/track.py
@@ -536,8 +536,8 @@ class TrackObject(Signallable, Loggable):
self._updatePriority(priority)
def _updatePriority(self, priority):
- # The priority of an effect should always be higher than the priority of
- # the track it is applied to. Those priority are affected when we add a
+ # The priority of an effect should always be higher than the priority of
+ # the track it is applied to. Those priority are affected when we add a
# TrackObject to timeline
if type(self) is TrackEffect:
if self.stream_type is VideoStream:
diff --git a/pitivi/ui/curve.py b/pitivi/ui/curve.py
index c0f9023..ec2c19a 100644
--- a/pitivi/ui/curve.py
+++ b/pitivi/ui/curve.py
@@ -118,8 +118,8 @@ class Curve(goocanvas.ItemSimple, goocanvas.Item, View, Zoomable):
bounds = view.bounds
time = (Zoomable.pixelToNs(pos[0] - bounds.x1) +
view.element.in_point)
- value = ((1 - (pos[1] - KW_LABEL_Y_OVERFLOW - bounds.y1 -
- view._min) / view._range) *
+ value = ((1 - (pos[1] - KW_LABEL_Y_OVERFLOW - bounds.y1 -
+ view._min) / view._range) *
interpolator.range) + interpolator.lower
return time, value
@@ -206,7 +206,7 @@ class Curve(goocanvas.ItemSimple, goocanvas.Item, View, Zoomable):
def _getKeyframeXY(self, kf):
interp = self.interpolator
x = self.nsToPixel(kf.time - self.element.in_point)
- y = KW_LABEL_Y_OVERFLOW + self._range - (((kf.value -
+ y = KW_LABEL_Y_OVERFLOW + self._range - (((kf.value -
interp.lower) / interp.range) * self._range)
return point.Point(x + self.bounds.x1, y + self.bounds.y1 + self._min)
@@ -266,7 +266,7 @@ class Curve(goocanvas.ItemSimple, goocanvas.Item, View, Zoomable):
cr.clip()
# draw the value label
- roundedrec(cr, x - KW_LABEL_HPAD2, y - KW_LABEL_VPAD2,
+ roundedrec(cr, x - KW_LABEL_HPAD2, y - KW_LABEL_VPAD2,
w + KW_LABEL_HPAD, h + KW_LABEL_VPAD, r=10)
cr.set_source_rgb(1, 1, 1)
cr.fill()
@@ -291,7 +291,7 @@ class Curve(goocanvas.ItemSimple, goocanvas.Item, View, Zoomable):
def do_simple_is_item_at(self, x, y, cr, pointer_event):
if (between(0, x, self.visible_width) and
- between(KW_LABEL_Y_OVERFLOW, y, self.height +
+ between(KW_LABEL_Y_OVERFLOW, y, self.height +
KW_LABEL_Y_OVERFLOW)):
x += self.bounds.x1
y += self.bounds.y1
diff --git a/pitivi/ui/dynamic.py b/pitivi/ui/dynamic.py
index f848bd6..30bdfa8 100644
--- a/pitivi/ui/dynamic.py
+++ b/pitivi/ui/dynamic.py
@@ -686,17 +686,17 @@ if __name__ == '__main__':
("pear", "pear")),)),
(ColorWidget, 0x336699FF, (int,)),
(FontWidget, "Sans 9", ()),
- (FractionWidget, "30M",
- (gst.FractionRange(gst.Fraction(1, 1),
+ (FractionWidget, "30M",
+ (gst.FractionRange(gst.Fraction(1, 1),
gst.Fraction(30000, 1001)),)),
- (FractionWidget, gst.Fraction(25000, 1001),
+ (FractionWidget, gst.Fraction(25000, 1001),
(
gst.FractionRange(
- gst.Fraction(1, 1),
+ gst.Fraction(1, 1),
gst.Fraction(30000, 1001)
),
(
- "25:1",
+ "25:1",
gst.Fraction(30,1),
"30M",
),
diff --git a/pitivi/ui/encodingdialog.py b/pitivi/ui/encodingdialog.py
index 2c3893f..ae78372 100644
--- a/pitivi/ui/encodingdialog.py
+++ b/pitivi/ui/encodingdialog.py
@@ -96,7 +96,7 @@ def extension_for_muxer(muxer):
return ""
def factorylist(factories):
- """ Given a sequence of factories, returns a gtk.ListStore()
+ """ Given a sequence of factories, returns a gtk.ListStore()
of sorted, beautified factory names """
return model((str, object),
@@ -170,7 +170,7 @@ class EncodingDialog(GladeWindow, Renderer, Loggable):
self.muxercombobox.set_model(factorylist(
self.settings.muxers))
# note: this will trigger an update of the codec comboboxes
- set_combo_value(self.muxercombobox,
+ set_combo_value(self.muxercombobox,
gst.element_factory_find(self.settings.muxer))
# Encoder/Muxer settings
diff --git a/pitivi/ui/prefs.py b/pitivi/ui/prefs.py
index 23c09d6..f2e9a2c 100644
--- a/pitivi/ui/prefs.py
+++ b/pitivi/ui/prefs.py
@@ -129,7 +129,7 @@ class PreferencesDialog(gtk.Window):
## Public API
@classmethod
- def addPreference(cls, attrname, label, description, section=None,
+ def addPreference(cls, attrname, label, description, section=None,
widget_klass=None, **args):
"""
Add a user preference. The preferences dialog will try
diff --git a/pitivi/ui/preset.py b/pitivi/ui/preset.py
index 432ac97..5271925 100644
--- a/pitivi/ui/preset.py
+++ b/pitivi/ui/preset.py
@@ -155,7 +155,7 @@ class VideoPresetManager(PresetManager):
str(int(values["frame-rate"].num)))
parser.set(section, "framerate-denom",
str(int(values["frame-rate"].denom)))
- parser.set(section, "par-num",
+ parser.set(section, "par-num",
str(int(values["par"].num)))
parser.set(section, "par-denom",
str(int(values["par"].denom)))
diff --git a/pitivi/ui/previewer.py b/pitivi/ui/previewer.py
index 00c35a5..9fb8c68 100644
--- a/pitivi/ui/previewer.py
+++ b/pitivi/ui/previewer.py
@@ -66,7 +66,7 @@ GlobalSettings.addConfigOption("thumbnailCacheSize",
key="cache-size",
default=250)
-# the maximum number of thumbnails to enqueue at a given time. setting this to
+# the maximum number of thumbnails to enqueue at a given time. setting this to
# a larger value will increase latency after large operations, such as zooming
GlobalSettings.addConfigOption("thumbnailMaxRequests",
section="thumbnailing",
diff --git a/pitivi/ui/projectsettings.py b/pitivi/ui/projectsettings.py
index b708e12..d678200 100644
--- a/pitivi/ui/projectsettings.py
+++ b/pitivi/ui/projectsettings.py
@@ -82,13 +82,13 @@ class ProjectSettingsDialog(GladeWindow):
# add custom widgets
self.dar_fraction_widget = FractionWidget()
- self.video_properties_table.attach(self.dar_fraction_widget,
+ self.video_properties_table.attach(self.dar_fraction_widget,
0, 1, 6, 7, xoptions=gtk.EXPAND | gtk.FILL, yoptions=0)
self.dar_fraction_widget.show()
# add custom widgets
self.par_fraction_widget = FractionWidget()
- self.video_properties_table.attach(self.par_fraction_widget,
+ self.video_properties_table.attach(self.par_fraction_widget,
1, 2, 6, 7, xoptions=gtk.EXPAND | gtk.FILL, yoptions=0)
self.par_fraction_widget.show()
@@ -105,7 +105,7 @@ class ProjectSettingsDialog(GladeWindow):
self.channels_combo.set_model(audio_channels)
self.sample_rate_combo.set_model(audio_rates)
self.sample_depth_combo.set_model(audio_depths)
-
+
# set the project metadata
# FIXME: not saved in the project file
if self.year_spinbutton.get_value_as_int() == 1900:
@@ -119,7 +119,7 @@ class ProjectSettingsDialog(GladeWindow):
self.wg = RippleUpdateGroup(
(self.frame_rate_combo, self._updateCombo, "changed",
self.frame_rate_fraction_widget),
- (self.frame_rate_fraction_widget, self._updateFraction,
+ (self.frame_rate_fraction_widget, self._updateFraction,
"value-changed", self.frame_rate_combo),
(self.dar_combo, None, "changed"),
(self.dar_fraction_widget, None, "value-changed"),
@@ -237,7 +237,7 @@ class ProjectSettingsDialog(GladeWindow):
lambda : get_combo_value(widget))
def bindSpinbutton(self, mgr, name, widget):
- mgr.bindWidget(name,
+ mgr.bindWidget(name,
lambda x: widget.set_value(float(x)),
lambda : int(widget.get_value()))
@@ -372,7 +372,7 @@ class ProjectSettingsDialog(GladeWindow):
self.dar_combo))
def updateDarFromFractionWidget(self):
- set_combo_value(self.dar_combo,
+ set_combo_value(self.dar_combo,
self.dar_fraction_widget.getWidgetValue())
def updateParFromCombo(self):
@@ -380,7 +380,7 @@ class ProjectSettingsDialog(GladeWindow):
self.par_combo))
def updateParFromFractionWidget(self):
- set_combo_value(self.par_combo,
+ set_combo_value(self.par_combo,
self.par_fraction_widget.getWidgetValue())
def updateUI(self):
diff --git a/pitivi/ui/ripple_update_group.py b/pitivi/ui/ripple_update_group.py
index 7e1dce8..c683940 100644
--- a/pitivi/ui/ripple_update_group.py
+++ b/pitivi/ui/ripple_update_group.py
@@ -24,16 +24,16 @@ class RippleUpdateGroup(object):
"""Allows for event-driven spreadsheet-like ripple updates without
infinite loops.
-
+
This class allows you to express an event-driven sequence of operations in
terms of a directed graph. It is not a constraint solver: The goal is to
allow the programmer to reduce complex logic to a set of simple functions
and predicates combined declaratively.
-
+
Events propagate through the graph in breadth first order. During an
update cycle, each vertex is visited only once, so cycles can exist in the
graph without creating infinite loops.
-
+
Each vertex represents a unique object. The following may also be
associated with a vertex:
diff --git a/pitivi/ui/timeline.py b/pitivi/ui/timeline.py
index 1e03aba..4f0e214 100644
--- a/pitivi/ui/timeline.py
+++ b/pitivi/ui/timeline.py
@@ -576,7 +576,7 @@ class Timeline(gtk.Table, Loggable, Zoomable):
def _updateScrollPosition(self, adjustment):
self._scroll_pos_ns = Zoomable.pixelToNs(self.hadj.get_value())
- self._root_item.set_simple_transform( -self.hadj.get_value(),
+ self._root_item.set_simple_transform( -self.hadj.get_value(),
-self.vadj.get_value(), 1.0, 0)
def _zoomAdjustmentChangedCb(self, adjustment):
@@ -797,7 +797,7 @@ class Timeline(gtk.Table, Loggable, Zoomable):
def keyframe(self, action):
timeline_position = self._position
selected = self.timeline.selection.getSelectedTrackObjs()
-
+
for obj in selected:
keyframe_exists = False
diff --git a/pitivi/ui/viewer.py b/pitivi/ui/viewer.py
index 886f66e..fe46e0c 100644
--- a/pitivi/ui/viewer.py
+++ b/pitivi/ui/viewer.py
@@ -69,7 +69,7 @@ class PitiviViewer(gtk.VBox, Loggable):
__gtype_name__ = 'PitiviViewer'
__gsignals__ = {
- "activate-playback-controls" : (gobject.SIGNAL_RUN_LAST,
+ "activate-playback-controls" : (gobject.SIGNAL_RUN_LAST,
gobject.TYPE_NONE, (gobject.TYPE_BOOLEAN,)),
}
diff --git a/tests/test_binary_search.py b/tests/test_binary_search.py
index 74bd2f8..8e348ac 100644
--- a/tests/test_binary_search.py
+++ b/tests/test_binary_search.py
@@ -20,21 +20,21 @@ class BasicTest(TestCase):
for offset in xrange(1, 5):
for length in xrange(1, 2049, 300):
A = [i * offset for i in xrange(0, length)]
-
+
## check negative hits
-
+
# search value too low
# error if value is found
# if search returns non-negative index, fail
value = A[0] - 1
self.assertFalse(found(A, binary_search(A, value), value))
-
+
# search value too high
# error if value is found
# if search returns non-negative index, fail
value = A[-1] + 1
self.assertFalse(found(A, binary_search(A, value), value))
-
+
## check positive hits
for i, a in enumerate(A):
# error if value is NOT found
diff --git a/tests/test_cache.py b/tests/test_cache.py
index bf18606..76d0e4b 100644
--- a/tests/test_cache.py
+++ b/tests/test_cache.py
@@ -15,7 +15,7 @@ class CacheTest(TestCase):
assert len(c.cache) == 32
assert not 31 in c
assert 32 in c
-
+
# touch the LRU item, and then add something to the queue
# the item should still remain in the queue
diff --git a/tests/test_etree_formatter.py b/tests/test_etree_formatter.py
index 1f9df38..31528fa 100644
--- a/tests/test_etree_formatter.py
+++ b/tests/test_etree_formatter.py
@@ -118,7 +118,7 @@ class TestFormatterSave(TestCase):
effect1.addOutputStream(video_stream)
effect1.addInputStream(video_stream)
- #It is necessary to had the identity factory to the
+ #It is necessary to had the identity factory to the
#effect_factories_dictionnary
self.formatter.avalaible_effects._effect_factories_dict['identity'] =\
effect1
diff --git a/tests/test_factories_base.py b/tests/test_factories_base.py
index ebbfda1..485cad8 100644
--- a/tests/test_factories_base.py
+++ b/tests/test_factories_base.py
@@ -127,7 +127,7 @@ class TestLiveSourceFactory(TestCase):
# pass an explicit default_duration
factory = LiveSourceFactory('live://', 'name', 10 * gst.SECOND)
self.failUnlessEqual(factory.default_duration, 10 * gst.SECOND)
-
+
# check that if a LiveSourceFactory derived class doesn't pass a
# default_duration it's still set to 5 seconds
factory = LiveSourceFactory('name')
diff --git a/tests/test_factories_file.py b/tests/test_factories_file.py
index 68ccb66..f01ccd3 100644
--- a/tests/test_factories_file.py
+++ b/tests/test_factories_file.py
@@ -220,7 +220,7 @@ class TestPictureFileSourceFactory(TestCase):
self.factory.addOutputStream(video2)
self.factory.addOutputStream(audio)
- # We're no longer using ffvideoscale, so this check is obsolete.
+ # We're no longer using ffvideoscale, so this check is obsolete.
# TODO: implement this functinality in smartscale, and test it
# separately
#if gst.registry_get_default().find_feature('ffvideoscale',
diff --git a/tests/test_factories_operation.py b/tests/test_factories_operation.py
index df01b0b..23bb77b 100644
--- a/tests/test_factories_operation.py
+++ b/tests/test_factories_operation.py
@@ -3,7 +3,7 @@
# test/test_factories_operation.py
#
# Copyright (C) 2010 Thibault Saunier <tsaunier gnome org>
-#
+#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
diff --git a/tests/test_gap.py b/tests/test_gap.py
index 0006b62..8cb1359 100644
--- a/tests/test_gap.py
+++ b/tests/test_gap.py
@@ -100,7 +100,7 @@ class TestGap(TestCase):
timeline_object2 = self.makeTimelineObject()
timeline_object3 = self.makeTimelineObject()
timeline_object4 = self.makeTimelineObject()
-
+
timeline_object1.start = 5 * gst.SECOND
timeline_object1.duration = 10 * gst.SECOND
timeline_object1.priority = 1
diff --git a/tests/test_integration.py b/tests/test_integration.py
index 65b8b22..23d486b 100644
--- a/tests/test_integration.py
+++ b/tests/test_integration.py
@@ -262,7 +262,7 @@ class InstanceRunner(Signallable):
attrname = "video%d" % self.videoTracks
container = self.container()
setattr(self, attrname, container)
- self.tracks[track] = container
+ self.tracks[track] = container
container.transitions = {}
track.connect("transition-added", self._transitionAddedCb, container)
track.connect("transition-removed", self._transitionRemovedCb,
@@ -437,28 +437,28 @@ class TestBasic(Base):
self.failUnlessEqual(self.runner.errors, set((test3,)))
def testConfigureTimeline(self):
-
+
config = Configuration()
config.addSource(
- "object1",
- test1,
+ "object1",
+ test1,
{
"start" : 0,
"duration" : gst.SECOND,
"media-start" : gst.SECOND,
})
config.addSource(
- "object2",
+ "object2",
test2,
{
"start" : gst.SECOND,
"duration" : gst.SECOND,
})
-
+
def timelineConfigured(runner):
config.matches(self.runner)
self.runner.shutDown()
-
+
self.runner.loadConfiguration(config)
self.runner.connect("timeline-configured", timelineConfigured)
self.runner.run()
@@ -471,8 +471,8 @@ class TestBasic(Base):
def testMoveSources(self):
initial = Configuration()
initial.addSource(
- "object1",
- test1,
+ "object1",
+ test1,
{
"start" : 0,
"duration" : gst.SECOND,
@@ -480,7 +480,7 @@ class TestBasic(Base):
"priority" : 0
})
initial.addSource(
- "object2",
+ "object2",
test2,
{
"start" : gst.SECOND,
@@ -503,7 +503,7 @@ class TestBasic(Base):
})
def timelineConfigured(runner):
- context = MoveContext(self.runner.timeline,
+ context = MoveContext(self.runner.timeline,
self.runner.video1.object1,
set((self.runner.audio1.object2,)))
brush.scrub(context, 10 * gst.SECOND, 1, steps=10)
@@ -527,7 +527,7 @@ class TestBasic(Base):
def testRippleMoveSimple(self):
initial = Configuration()
- initial.addSource('clip1', test1, {
+ initial.addSource('clip1', test1, {
"duration" : gst.SECOND,
"start" : gst.SECOND,
"priority" : 2})
@@ -629,7 +629,7 @@ class TestSeeking(Base):
"duration" : gst.SECOND,
"priority" : i % 2,
})
-
+
def _startSeeking(self, interval, steps=10):
self.count = 0
@@ -642,7 +642,7 @@ class TestSeeking(Base):
if self.count < self.steps:
self.runner.watchdog.keepAlive()
self.count += 1
- self.cur_pos = random.randint(0,
+ self.cur_pos = random.randint(0,
self.runner.timeline.duration)
self.runner.project.pipeline.seek(self.cur_pos)
return True
@@ -699,13 +699,13 @@ class TestRippleExtensive(Base):
for j in xrange(0, 10):
if j < i:
final.addSource('clip%d' % j, test1,
- { 'start' : gst.SECOND * j,
+ { 'start' : gst.SECOND * j,
'duration' : gst.SECOND,
'priority' : j % 2})
else:
final.addSource('clip%d' % j, test1,
- { 'start' : gst.SECOND * (j + 10),
- 'duration' : gst.SECOND,
+ { 'start' : gst.SECOND * (j + 10),
+ 'duration' : gst.SECOND,
'priority' : (j % 2) + 1})
self.finals.append(final)
Base.__init__(self, unknown)
@@ -778,15 +778,15 @@ class TestTransitions(Base):
def testSimple(self):
initial = Configuration()
initial.addSource(
- "object1",
- test1,
+ "object1",
+ test1,
{
"start" : 0,
"duration" : 5 * gst.SECOND,
"priority" : 0,
})
initial.addSource(
- "object2",
+ "object2",
test1,
{
"start" : 5 * gst.SECOND,
@@ -818,7 +818,7 @@ class TestTransitions(Base):
def nextMove():
if moves:
self._cur_move = moves.pop(0)
- context = MoveContext(self.runner.timeline,
+ context = MoveContext(self.runner.timeline,
self.runner.video1.object2,
set([self.runner.video1.object2]))
brush.scrub(context, self._cur_move[0], self._cur_move[1], steps=10)
@@ -853,15 +853,15 @@ class TestTransitions(Base):
def testNoTransitionWhenMovingMultipleClips(self):
initial = Configuration()
initial.addSource(
- "object1",
- test1,
+ "object1",
+ test1,
{
"start" : 0,
"duration" : 5 * gst.SECOND,
"priority" : 0,
})
initial.addSource(
- "object2",
+ "object2",
test1,
{
"start" : 5 * gst.SECOND,
@@ -889,7 +889,7 @@ class TestTransitions(Base):
if moves:
self._cur_move = moves.pop(0)
other, start, priority = self._cur_move
- context = MoveContext(self.runner.timeline,
+ context = MoveContext(self.runner.timeline,
self.runner.video1.object2,
set([getattr(self.runner.video1, other)]))
brush.scrub(context, start, priority, steps=10)
@@ -913,15 +913,15 @@ class TestTransitions(Base):
def testOverlapOnlyWithValidTransitions(self):
initial = Configuration()
initial.addSource(
- "object1",
- test1,
+ "object1",
+ test1,
{
"start" : 0,
"duration" : 5 * gst.SECOND,
"priority" : 0,
})
initial.addSource(
- "object2",
+ "object2",
test1,
{
"start" : 5 * gst.SECOND,
@@ -939,7 +939,7 @@ class TestTransitions(Base):
phase2 = initial.clone()
phase2.updateSource(
- "object2",
+ "object2",
props={
"start" : 4 * gst.SECOND,
})
@@ -973,7 +973,7 @@ class TestTransitions(Base):
# [1------] [3-------]
# [2--]
- (MoveContext, "object2", 4 * gst.SECOND, 0, phase2,
+ (MoveContext, "object2", 4 * gst.SECOND, 0, phase2,
[("object1", "object2")]),
# Activates overlap prevention
@@ -990,7 +990,7 @@ class TestTransitions(Base):
[("object1", "object2")]),
# Activates overlap prevention
- # [1------]
+ # [1------]
# [3-]
# [2--]
(MoveContext, "object3", 4 * gst.SECOND, 0, phase3,
@@ -1033,7 +1033,7 @@ class TestTransitions(Base):
("object2", "object3")]),
]
-
+
nmoves = len(moves)
def timelineConfigured(runner):
@@ -1045,7 +1045,7 @@ class TestTransitions(Base):
self._cur_move = moves.pop(0)
context, focus, start, priority, config, trans = self._cur_move
obj = getattr(self.runner.video1, focus)
- context = context(self.runner.timeline,
+ context = context(self.runner.timeline,
obj, set())
brush.scrub(context, start, priority, steps=10)
else:
diff --git a/tests/test_signallable.py b/tests/test_signallable.py
index 7812422..bed3957 100644
--- a/tests/test_signallable.py
+++ b/tests/test_signallable.py
@@ -155,7 +155,7 @@ class TestSignalisation(unittest.TestCase):
function_cb)
self.object.emit("signal-oneargs", 42)
-
+
def test04_emit01(self):
# signal : no arguments
diff --git a/tests/test_transitions.py b/tests/test_transitions.py
index 1756293..faf437a 100644
--- a/tests/test_transitions.py
+++ b/tests/test_transitions.py
@@ -164,7 +164,7 @@ class TestTransitions(TestCase):
self.failUnlessEqual(at.b_operation.props.duration, 5 * gst.SECOND)
-
+
# make A longer
objs["a"].duration = 11 * gst.SECOND
self.failUnlessEqual(vt.start, 10 * gst.SECOND)
@@ -270,7 +270,7 @@ class TestTransitions(TestCase):
]
expected = [
- ["a", "b", "c", "d", "f", "g", "h", "l"],
+ ["a", "b", "c", "d", "f", "g", "h", "l"],
["i"],
["e", "j"],
["k"]
@@ -286,7 +286,7 @@ class TestTransitions(TestCase):
track1.addTrackObject(obj)
objs[obj] = name
- result = [[objs[obj] for obj in layer] for layer in
+ result = [[objs[obj] for obj in layer] for layer in
track1.getTrackObjectsGroupedByLayer()]
self.failUnlessEqual(result, expected)
@@ -327,7 +327,7 @@ class TestTransitions(TestCase):
ordered.append(obj)
slots, valid = track1.getValidTransitionSlots(ordered)
- result = [[names[obj] for obj in layer] for layer in
+ result = [[names[obj] for obj in layer] for layer in
slots]
self.failUnlessEqual(result, expected)
@@ -494,7 +494,7 @@ class TestTransitions(TestCase):
removed = []
def transitionAddedCb(track, transition):
- added.append((names[transition.a],
+ added.append((names[transition.a],
names[transition.b]))
def transitionRemovedCb(track, transition):
@@ -676,7 +676,7 @@ class TestTransitions(TestCase):
result = ["", []]
for obj in track1.track_objects:
result[0] += names[obj]
- result[1].append(obj._position)
+ result[1].append(obj._position)
resulting_stagger = [(names[obj], obj._stagger) for obj in
track1.track_objects]
self.failUnlessEqual(result, expected)
@@ -698,7 +698,7 @@ class TestTransitions(TestCase):
addClip('m', 16, 17)
expected = ["abcmdfghijkl", [0, 1, 2, 0, 3, 5, 4, 5, 0, 6, 7, 0]]
verify_result(expected)
-
+
# re-order a few clips
track1.disableUpdates()
diff --git a/tests/testcomplex.py b/tests/testcomplex.py
index 571e8d0..36036f7 100644
--- a/tests/testcomplex.py
+++ b/tests/testcomplex.py
@@ -35,7 +35,7 @@ class TestComposition(gobject.GObject):
gobject.TYPE_NONE,
(gobject.TYPE_PYOBJECT, )),
}
-
+
def __init__(self, *args, **kwargs):
gobject.GObject.__init__(self, *args, **kwargs)
self.media_type = MEDIA_TYPE_VIDEO
diff --git a/win32/setup.py b/win32/setup.py
index f51f946..b112267 100644
--- a/win32/setup.py
+++ b/win32/setup.py
@@ -48,7 +48,7 @@ class Deploy():
exit(1)
else:
exit(0)
-
+
def setPathVariables(self):
self.curr_dir = os.getcwd()
if not self.curr_dir.endswith('win32'):
@@ -75,7 +75,7 @@ class Deploy():
shutil.copy(os.path.join(self.gstPath, 'bin', 'libxml2-2.dll'),
os.path.join(self.dist_bin_dir, 'libxml2.dll'))
os.environ['PATH'] = os.environ['PATH']+';'+self.dist_bin_dir
-
+
def createDeploymentFolder(self):
# Create a Unix-like diretory tree to deploy PiTiVi
print ('Create deployment directory')
@@ -85,11 +85,11 @@ class Deploy():
except :
self.close("ERROR: Can't delete folder %s"%self.dist_dir)
- for path in [self.dist_dir, self.dist_bin_dir, self.dist_etc_dir,
- self.dist_share_dir, self.dist_lib_pitivi_dir,
+ for path in [self.dist_dir, self.dist_bin_dir, self.dist_etc_dir,
+ self.dist_share_dir, self.dist_lib_pitivi_dir,
self.dist_share_pixmaps_dir]:
os.makedirs(path)
-
+
def checkDependencies(self):
print ('Checking dependencies')
try:
@@ -102,7 +102,7 @@ class Deploy():
'http://www.gstreamer-winbuild.ylatuya.es')
else:
print ('GStreamer... OK')
-
+
try:
import pygtk
pygtk.require('2.0')
@@ -152,7 +152,7 @@ class Deploy():
os.path.join(self.root_dir, 'pitivi'))
# Copy ui files to lib/pitivi
ui_dir = os.path.join(self.root_dir, 'pitivi', 'ui')
- shutil.copy (os.path.join(ui_dir, 'mainwindow.xml'),
+ shutil.copy (os.path.join(ui_dir, 'mainwindow.xml'),
os.path.join(self.dist_lib_pitivi_dir, 'mainwindow.xml'))
for name in [x for x in os.listdir(ui_dir) if x.endswith('glade')]:
shutil.copy (os.path.join(ui_dir, name),
@@ -169,16 +169,16 @@ class Deploy():
out_name = name.replace('.png', '.svg')
shutil.copy (os.path.join(win32_pixmaps_dir, name),
os.path.join(self.dist_share_pixmaps_dir, out_name))
-
+
def deployGStreamer(self):
print ('Deploying GStreamer')
# Copy gstreamer binaries to the dist folder
for name in os.listdir(os.path.join(self.gstPath, 'bin')):
- shutil.copy (os.path.join(self.gstPath, 'bin', name),
+ shutil.copy (os.path.join(self.gstPath, 'bin', name),
self.dist_bin_dir)
shutil.copytree(os.path.join(self.gstPath, 'lib', 'gstreamer-0.10'),
os.path.join(self.dist_lib_dir, 'gstreamer-0.10'))
-
+
def deployGTK(self):
print ('Deploying Gtk dependencies')
# Copy Gtk files to the dist folder
@@ -207,14 +207,14 @@ class Deploy():
'packages':'pitivi',
'includes': 'gtk, cairo, pango, atk, pangocairo,\
zope.interface, gobject, gst, email',
- 'dist_dir' : self.dist_bin_dir
+ 'dist_dir' : self.dist_bin_dir
}
},
-
+
zipfile = None,
)
-
+
def main():
usage = "usage: %prog [options]"
parser = OptionParser(usage)
@@ -227,7 +227,7 @@ def main():
(options, args) = parser.parse_args()
Deploy(options.gstPath, options.gtkPath)
-
+
if __name__ == "__main__":
main()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
