Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonzalo Odiard <godiard@gmail.com>2013-11-26 14:26:50 (GMT)
committer Gonzalo Odiard <godiard@gmail.com>2013-11-26 14:26:50 (GMT)
commitd75af77f0f2c32cc79049f7980fb85b3167d59e6 (patch)
treeabc375fb4beb7b1e7a4f54beb19be55fed187aa0
parent0357dcf1be024ef7ce3e8a13e6834bf93f1b4c6b (diff)
Pep8 fixes
Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
-rw-r--r--activity.py14
-rw-r--r--controls.py20
-rw-r--r--player.py3
-rw-r--r--playlist.py3
4 files changed, 20 insertions, 20 deletions
diff --git a/activity.py b/activity.py
index e3578ad..b4e54b8 100644
--- a/activity.py
+++ b/activity.py
@@ -58,8 +58,7 @@ PLAYLIST_WIDTH_PROP = 1.0 / 3
class JukeboxActivity(activity.Activity):
__gsignals__ = {
- 'playlist-finished': (GObject.SignalFlags.RUN_FIRST, None, []),
- }
+ 'playlist-finished': (GObject.SignalFlags.RUN_FIRST, None, []), }
def __init__(self, handle):
activity.Activity.__init__(self, handle)
@@ -80,9 +79,9 @@ class JukeboxActivity(activity.Activity):
self._view_toolbar = ViewToolbar()
self._view_toolbar.connect('go-fullscreen',
- self.__go_fullscreen_cb)
+ self.__go_fullscreen_cb)
self._view_toolbar.connect('toggle-playlist',
- self.__toggle_playlist_cb)
+ self.__toggle_playlist_cb)
view_toolbar_button = ToolbarButton(
page=self._view_toolbar,
icon_name='toolbar-view')
@@ -232,7 +231,7 @@ class JukeboxActivity(activity.Activity):
self.view_area.append_page(self._empty_widget, None)
self.view_area.append_page(self.videowidget, None)
self._video_canvas.pack_end(self.view_area, expand=True,
- fill=True, padding=0)
+ fill=True, padding=0)
def _switch_canvas(self, show_video):
"""Show or hide the video visualization in the canvas.
@@ -396,7 +395,7 @@ class JukeboxActivity(activity.Activity):
logging.error('ERROR DETAIL: %s', detail)
file_path = self.playlist_widget._items[
- self.playlist_widget.get_current_playing()]['path']
+ self.playlist_widget.get_current_playing()]['path']
mimetype = mime.get_for_file(file_path)
title = _('Error')
@@ -441,7 +440,8 @@ class JukeboxActivity(activity.Activity):
else:
if self._playlist_jobject is None:
- self._playlist_jobject = self.playlist_widget.create_playlist_jobject()
+ self._playlist_jobject = \
+ self.playlist_widget.create_playlist_jobject()
# Add the playlist to the playlist jobject description.
# This is only done if the activity was not started from a
diff --git a/controls.py b/controls.py
index f88e2a9..ebf854e 100644
--- a/controls.py
+++ b/controls.py
@@ -55,8 +55,8 @@ class Controls(GObject.GObject):
erase_playlist_entry_btn = ToolButton(icon_name='list-remove')
erase_playlist_entry_btn.set_tooltip(_('Remove track'))
- erase_playlist_entry_btn.connect('clicked',
- self.__erase_playlist_entry_clicked_cb)
+ erase_playlist_entry_btn.connect(
+ 'clicked', self.__erase_playlist_entry_clicked_cb)
self.toolbar.insert(erase_playlist_entry_btn, -1)
self._spacer = Gtk.SeparatorToolItem()
@@ -107,9 +107,9 @@ class Controls(GObject.GObject):
logging.debug("FIXME: AttributeError: 'Scale' object has no "
"attribute 'set_update_policy'")
self.hscale.connect('button-press-event',
- self.__scale_button_press_cb)
+ self.__scale_button_press_cb)
self.hscale.connect('button-release-event',
- self.__scale_button_release_cb)
+ self.__scale_button_release_cb)
self.scale_item = Gtk.ToolItem()
self.scale_item.set_expand(True)
@@ -203,8 +203,8 @@ class Controls(GObject.GObject):
self.check_if_next_prev()
self.activity._switch_canvas(False)
- self.activity._view_toolbar.\
- _show_playlist.set_active(True)
+ self.activity._view_toolbar._show_playlist.set_active(
+ True)
finally:
if jobject is not None:
jobject.destroy()
@@ -293,8 +293,8 @@ class Controls(GObject.GObject):
# make sure we get changed notifies
if self._scale_value_changed_id == -1:
- self._scale_value_changed_id = self.hscale.connect('value-changed',
- self.__scale_value_changed_cb)
+ self._scale_value_changed_id = self.hscale.connect(
+ 'value-changed', self.__scale_value_changed_cb)
def __scale_value_changed_cb(self, scale):
if self._scale_reseek_timeout_id != -1:
@@ -305,8 +305,8 @@ class Controls(GObject.GObject):
def _reseek(self):
self._scale_reseek_timeout_id = -1
- location = long(self.activity.control.hscale.get_value() * \
- self.p_duration / 100) # in ns
+ location = long(self.activity.control.hscale.get_value() *
+ self.p_duration / 100) # in ns
self.activity.player.seek(location)
# Allow for a preroll
self.activity.player.get_state(timeout=50 * Gst.MSECOND) # 50 ms
diff --git a/player.py b/player.py
index 0529ca6..9665d34 100644
--- a/player.py
+++ b/player.py
@@ -25,7 +25,8 @@ from gi.repository import GObject
from gi.repository import GdkX11, GstVideo
# Avoid "Fatal Python error: GC object already tracked"
-# http://stackoverflow.com/questions/7496629/gstreamer-appsrc-causes-random-crashes
+# http://stackoverflow.com/questions/7496629/
+# gstreamer-appsrc-causes-random-crashes
# GObject.threads_init()
# Initialize GStreamer
diff --git a/playlist.py b/playlist.py
index 5ebca02..57bd581 100644
--- a/playlist.py
+++ b/playlist.py
@@ -36,8 +36,7 @@ class PlayList(Gtk.ScrolledWindow):
__gsignals__ = {
'play-index': (GObject.SignalFlags.RUN_FIRST, None, [int, str]),
- 'missing-tracks': (GObject.SignalFlags.RUN_FIRST, None, [object]),
- }
+ 'missing-tracks': (GObject.SignalFlags.RUN_FIRST, None, [object]), }
def __init__(self):
self._current_playing = 0