remove too many blank lines

This commit is contained in:
MarkusHackspacher 2018-07-24 14:11:05 +02:00
parent 46bb7b4987
commit 3ce9cd55e7
33 changed files with 8 additions and 87 deletions

View File

@ -10,5 +10,4 @@ install:
- python3 tools/localdepends.py - python3 tools/localdepends.py
script: script:
- pycodestyle share src/gpodder tools bin/* *.py - pycodestyle share src/gpodder tools bin/* *.py
- isort -c -rc
- make releasetest - make releasetest

View File

@ -33,6 +33,7 @@ import os.path
import platform import platform
import subprocess import subprocess
import sys import sys
from optparse import OptionParser
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -46,7 +47,6 @@ except ImportError:
""", file=sys.stderr) """, file=sys.stderr)
have_dbus = False have_dbus = False
from optparse import OptionParser
def main(): def main():
@ -79,7 +79,7 @@ def main():
# Set up the path to translation files # Set up the path to translation files
gettext.bindtextdomain('gpodder', locale_dir) gettext.bindtextdomain('gpodder', locale_dir)
import gpodder import gpodder # isort:skip
gpodder.prefix = prefix gpodder.prefix = prefix

View File

@ -15,6 +15,10 @@
import os import os
import sys import sys
import dbus
import gpodder
if len(sys.argv) != 2: if len(sys.argv) != 2:
print(""" print("""
Usage: %s /path/to/episode.mp3 Usage: %s /path/to/episode.mp3
@ -23,8 +27,6 @@ if len(sys.argv) != 2:
filename = os.path.abspath(sys.argv[1]) filename = os.path.abspath(sys.argv[1])
import dbus
import gpodder
session_bus = dbus.SessionBus() session_bus = dbus.SessionBus()
proxy = session_bus.get_object(gpodder.dbus_bus_name, proxy = session_bus.get_object(gpodder.dbus_bus_name,

View File

@ -22,8 +22,6 @@ __category__ = 'desktop-integration'
__only_for__ = 'gtk' __only_for__ = 'gtk'
__disable_in__ = 'unity,win32,python3' __disable_in__ = 'unity,win32,python3'
DefaultConfig = { DefaultConfig = {
'download_progress_bar': False, # draw progress bar on icon while downloading? 'download_progress_bar': False, # draw progress bar on icon while downloading?
} }

View File

@ -55,8 +55,6 @@ import gpodder
gi.require_version('Gtk', '3.0') gi.require_version('Gtk', '3.0')
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

View File

@ -16,8 +16,6 @@ _ = gpodder.gettext
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
__title__ = _('Stream to Sonos') __title__ = _('Stream to Sonos')
__description__ = _('Stream podcasts to Sonos speakers') __description__ = _('Stream podcasts to Sonos speakers')
__authors__ = 'Stefan Kögl <stefan@skoegl.net>' __authors__ = 'Stefan Kögl <stefan@skoegl.net>'

View File

@ -38,8 +38,6 @@ __authors__ = 'Sean Munkel <seanmunkel@gmail.com>'
__category__ = 'desktop-integration' __category__ = 'desktop-integration'
__only_for__ = 'win32' __only_for__ = 'win32'
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
WSTRING = c_wchar_p WSTRING = c_wchar_p

View File

@ -20,9 +20,6 @@ __only_for__ = 'gtk'
__mandatory_in__ = 'unity' __mandatory_in__ = 'unity'
__disable_in__ = 'win32' __disable_in__ = 'win32'
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

View File

@ -34,8 +34,6 @@ _ = gpodder.gettext
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class CoverDownloader(object): class CoverDownloader(object):
# File name extension dict, lists supported cover art extensions # File name extension dict, lists supported cover art extensions
# Values: functions that check if some data is of that file type # Values: functions that check if some data is of that file type

View File

@ -35,13 +35,9 @@ from gpodder import schema, util
_ = gpodder.gettext _ = gpodder.gettext
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class Database(object): class Database(object):
TABLE_PODCAST = 'podcast' TABLE_PODCAST = 'podcast'
TABLE_EPISODE = 'episode' TABLE_EPISODE = 'episode'

View File

@ -35,8 +35,6 @@ from gpodder import opml, util
_ = gpodder.gettext _ = gpodder.gettext
class DirectoryEntry(object): class DirectoryEntry(object):
def __init__(self, title, url, image=None, subscribers=-1, description=None): def __init__(self, title, url, image=None, subscribers=-1, description=None):
self.title = title self.title = title

View File

@ -45,11 +45,6 @@ from gpodder import escapist_videos, util, vimeo, youtube
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
_ = gpodder.gettext _ = gpodder.gettext

View File

@ -36,7 +36,6 @@ from gpodder import util
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
# This matches the more reliable URL # This matches the more reliable URL
ESCAPIST_NUMBER_RE = re.compile(r'http://www.escapistmagazine.com/videos/view/(\d+)', re.IGNORECASE) ESCAPIST_NUMBER_RE = re.compile(r'http://www.escapistmagazine.com/videos/view/(\d+)', re.IGNORECASE)
# This matches regular URL, mainly those that come in the RSS feeds # This matches regular URL, mainly those that come in the RSS feeds

View File

@ -26,8 +26,6 @@ from gpodder.gtkui.interface.common import BuilderWidget
_ = gpodder.gettext _ = gpodder.gettext
class gPodderChannel(BuilderWidget): class gPodderChannel(BuilderWidget):
MAX_SIZE = 120 MAX_SIZE = 120

View File

@ -27,8 +27,6 @@ _ = gpodder.gettext
N_ = gpodder.ngettext N_ = gpodder.ngettext
class gPodderEpisodeSelector(BuilderWidget): class gPodderEpisodeSelector(BuilderWidget):
"""Episode selection dialog """Episode selection dialog

View File

@ -41,8 +41,6 @@ _ = gpodder.gettext
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class DirectoryPodcastsModel(Gtk.ListStore): class DirectoryPodcastsModel(Gtk.ListStore):
C_SELECTED, C_MARKUP, C_TITLE, C_URL = list(range(4)) C_SELECTED, C_MARKUP, C_TITLE, C_URL = list(range(4))

View File

@ -31,14 +31,10 @@ from gpodder.gtkui.interface.configeditor import gPodderConfigEditor
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
_ = gpodder.gettext _ = gpodder.gettext
N_ = gpodder.ngettext N_ = gpodder.ngettext
class NewEpisodeActionList(Gtk.ListStore): class NewEpisodeActionList(Gtk.ListStore):
C_CAPTION, C_AUTO_DOWNLOAD = list(range(2)) C_CAPTION, C_AUTO_DOWNLOAD = list(range(2))

View File

@ -25,7 +25,6 @@ from gpodder.gtkui.interface.common import BuilderWidget
_ = gpodder.gettext _ = gpodder.gettext
class gPodderWelcome(BuilderWidget): class gPodderWelcome(BuilderWidget):
PADDING = 10 PADDING = 10

View File

@ -35,9 +35,6 @@ import gpodder
gi.require_version('PangoCairo', '1.0') gi.require_version('PangoCairo', '1.0')
class TextExtents(object): class TextExtents(object):
def __init__(self, ctx, text): def __init__(self, ctx, text):
tuple = ctx.text_extents(text) tuple = ctx.text_extents(text)

View File

@ -26,8 +26,6 @@ from gpodder.gtkui.interface.common import BuilderWidget
_ = gpodder.gettext _ = gpodder.gettext
class gPodderAddPodcast(BuilderWidget): class gPodderAddPodcast(BuilderWidget):
def new(self): def new(self):
if not hasattr(self, 'add_podcast_list'): if not hasattr(self, 'add_podcast_list'):

View File

@ -29,8 +29,6 @@ from gpodder.gtkui.base import GtkBuilderWidget
_ = gpodder.gettext _ = gpodder.gettext
class BuilderWidget(GtkBuilderWidget): class BuilderWidget(GtkBuilderWidget):
def __init__(self, parent, **kwargs): def __init__(self, parent, **kwargs):
self._window_iconified = False self._window_iconified = False

View File

@ -28,8 +28,6 @@ from gpodder.gtkui.interface.common import BuilderWidget
_ = gpodder.gettext _ = gpodder.gettext
class gPodderConfigEditor(BuilderWidget): class gPodderConfigEditor(BuilderWidget):
def new(self): def new(self):
name_column = Gtk.TreeViewColumn(_('Setting')) name_column = Gtk.TreeViewColumn(_('Setting'))

View File

@ -25,7 +25,6 @@ from gpodder.gtkui.widgets import SpinningProgressIndicator
_ = gpodder.gettext _ = gpodder.gettext
class ProgressIndicator(object): class ProgressIndicator(object):
# Delayed time until window is shown (for short operations) # Delayed time until window is shown (for short operations)
DELAY = 500 DELAY = 500

View File

@ -68,23 +68,12 @@ from gpodder.model import PodcastEpisode, check_root_folder_path
gi.require_version('Gtk', '3.0') gi.require_version('Gtk', '3.0')
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
_ = gpodder.gettext _ = gpodder.gettext
N_ = gpodder.ngettext N_ = gpodder.ngettext
class gPodder(BuilderWidget, dbus.service.Object): class gPodder(BuilderWidget, dbus.service.Object):
# Width (in pixels) of episode list icon # Width (in pixels) of episode list icon
EPISODE_LIST_ICON_WIDTH = 40 EPISODE_LIST_ICON_WIDTH = 40

View File

@ -37,11 +37,9 @@ from gpodder.gtkui import draw
_ = gpodder.gettext _ = gpodder.gettext
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
try: try:
from gi.repository import Gio from gi.repository import Gio
have_gio = True have_gio = True

View File

@ -33,12 +33,9 @@ from gpodder.services import ObservableService
_ = gpodder.gettext _ = gpodder.gettext
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class CoverDownloader(ObservableService): class CoverDownloader(ObservableService):
""" """
This class manages downloading cover art and notification This class manages downloading cover art and notification

View File

@ -42,8 +42,6 @@ from gpodder import (coverart, escapist_videos, feedcore, schema, util, vimeo,
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
_ = gpodder.gettext _ = gpodder.gettext

View File

@ -36,6 +36,8 @@ import gpodder
# Append gPodder's user agent to mygpoclient's user agent # Append gPodder's user agent to mygpoclient's user agent
import mygpoclient import mygpoclient
from gpodder import minidb, util from gpodder import minidb, util
from mygpoclient import api, public
from mygpoclient import util as mygpoutil
_ = gpodder.gettext _ = gpodder.gettext
@ -68,11 +70,6 @@ except ImportError:
MissingCredentials = object() MissingCredentials = object()
from mygpoclient import api
from mygpoclient import public
from mygpoclient import util as mygpoutil
EPISODE_ACTIONS_BATCH_SIZE = 100 EPISODE_ACTIONS_BATCH_SIZE = 100

View File

@ -47,10 +47,6 @@ from gpodder import util
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class Importer(object): class Importer(object):
""" """
Helper class to import an OPML feed from protocols Helper class to import an OPML feed from protocols

View File

@ -30,7 +30,6 @@ from gpodder import util
_ = gpodder.gettext _ = gpodder.gettext
class ObservableService(object): class ObservableService(object):
def __init__(self, signal_names=[]): def __init__(self, signal_names=[]):
self.observers = {} self.observers = {}

View File

@ -65,10 +65,6 @@ import gpodder
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
if sys.hexversion < 0x03000000: if sys.hexversion < 0x03000000:
from html.parser import HTMLParser from html.parser import HTMLParser
from html.entities import name2codepoint from html.entities import name2codepoint

View File

@ -32,11 +32,9 @@ from gpodder import util
_ = gpodder.gettext _ = gpodder.gettext
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
VIMEOCOM_RE = re.compile(r'http[s]?://vimeo\.com/(channels/[^/]+|\d+)$', re.IGNORECASE) VIMEOCOM_RE = re.compile(r'http[s]?://vimeo\.com/(channels/[^/]+|\d+)$', re.IGNORECASE)
VIMEOCOM_VIDEO_RE = re.compile(r'http[s]?://vimeo.com/channels/(?:[^/])+/(\d+)$', re.IGNORECASE) VIMEOCOM_VIDEO_RE = re.compile(r'http[s]?://vimeo.com/channels/(?:[^/])+/(\d+)$', re.IGNORECASE)
MOOGALOOP_RE = re.compile(r'http[s]?://vimeo\.com/moogaloop\.swf\?clip_id=(\d+)$', re.IGNORECASE) MOOGALOOP_RE = re.compile(r'http[s]?://vimeo\.com/moogaloop\.swf\?clip_id=(\d+)$', re.IGNORECASE)

View File

@ -14,8 +14,6 @@ from gpodder.gtkui.draw import draw_cake_pixbuf
sys.path.insert(0, 'src') sys.path.insert(0, 'src')
def gen(percentage): def gen(percentage):
pixbuf = draw_cake_pixbuf(percentage) pixbuf = draw_cake_pixbuf(percentage)
return Gtk.Image.new_from_pixbuf(pixbuf) return Gtk.Image.new_from_pixbuf(pixbuf)