From 82f41f4c21f8b72e0d93d3011a75e153366ecaa1 Mon Sep 17 00:00:00 2001 From: MarkusHackspacher Date: Tue, 24 Jul 2018 11:08:10 +0200 Subject: [PATCH] sorting imports with isort -y -rc see #393 --- bin/gpo | 32 +++---- bin/gpodder | 8 +- bin/gpodder-migrate2tres | 10 +- setup.py | 1 - share/gpodder/examples/gpodder_mark_played.py | 2 +- share/gpodder/examples/hello_world.py | 1 + share/gpodder/extensions/audio_converter.py | 2 +- .../gpodder/extensions/concatenate_videos.py | 8 +- .../extensions/enqueue_in_mediaplayer.py | 2 +- .../episode_website_context_menu.py | 3 +- share/gpodder/extensions/gtk_statusicon.py | 12 ++- share/gpodder/extensions/normalize_audio.py | 2 +- .../gpodder/extensions/notification-win32.py | 6 +- share/gpodder/extensions/notification.py | 3 +- share/gpodder/extensions/rename_download.py | 2 +- share/gpodder/extensions/rm_ogg_cover.py | 4 +- .../gpodder/extensions/rockbox_convert2mp4.py | 4 +- share/gpodder/extensions/rockbox_coverart.py | 4 +- share/gpodder/extensions/sonos.py | 8 +- share/gpodder/extensions/tagging.py | 10 +- share/gpodder/extensions/taskbar_progress.py | 14 +-- share/gpodder/extensions/ted_subtitles.py | 7 +- .../gpodder/extensions/ubuntu_appindicator.py | 8 +- share/gpodder/extensions/ubuntu_unity.py | 9 +- .../extensions/update_feeds_on_startup.py | 3 +- share/gpodder/extensions/video_converter.py | 6 +- src/gpodder/common.py | 9 +- src/gpodder/config.py | 9 +- src/gpodder/core.py | 7 +- src/gpodder/coverart.py | 9 +- src/gpodder/dbsqlite.py | 19 ++-- src/gpodder/dbusproxy.py | 7 +- src/gpodder/directory.py | 12 +-- src/gpodder/download.py | 31 +++--- src/gpodder/escapist_videos.py | 16 ++-- src/gpodder/extensions.py | 8 +- src/gpodder/feedcore.py | 10 +- src/gpodder/feedservice.py | 3 +- src/gpodder/gtkui/base.py | 3 +- src/gpodder/gtkui/config.py | 7 +- src/gpodder/gtkui/desktop/channel.py | 8 +- src/gpodder/gtkui/desktop/deviceplaylist.py | 8 +- src/gpodder/gtkui/desktop/episodeselector.py | 8 +- src/gpodder/gtkui/desktop/podcastdirectory.py | 22 ++--- src/gpodder/gtkui/desktop/preferences.py | 21 ++--- src/gpodder/gtkui/desktop/sync.py | 10 +- src/gpodder/gtkui/desktop/welcome.py | 2 +- src/gpodder/gtkui/desktopfile.py | 9 +- src/gpodder/gtkui/download.py | 12 +-- src/gpodder/gtkui/draw.py | 24 +++-- src/gpodder/gtkui/interface/addpodcast.py | 7 +- src/gpodder/gtkui/interface/common.py | 9 +- src/gpodder/gtkui/interface/configeditor.py | 7 +- src/gpodder/gtkui/interface/progress.py | 6 +- src/gpodder/gtkui/interface/tagcloud.py | 4 +- src/gpodder/gtkui/main.py | 94 ++++++++----------- src/gpodder/gtkui/model.py | 23 ++--- src/gpodder/gtkui/services.py | 15 +-- src/gpodder/gtkui/shownotes.py | 14 +-- src/gpodder/gtkui/widgets.py | 7 +- src/gpodder/jsonconfig.py | 3 +- src/gpodder/log.py | 4 +- src/gpodder/model.py | 32 +++---- src/gpodder/my.py | 21 +++-- src/gpodder/opml.py | 16 ++-- src/gpodder/query.py | 6 +- src/gpodder/schema.py | 8 +- src/gpodder/services.py | 2 +- src/gpodder/sync.py | 18 ++-- src/gpodder/test/model.py | 1 - src/gpodder/unittests.py | 2 +- src/gpodder/util.py | 46 ++++----- src/gpodder/utilwin32ctypes.py | 6 +- src/gpodder/utilwin32locale.py | 6 +- src/gpodder/vimeo.py | 9 +- src/gpodder/youtube.py | 10 +- tools/i18n/summary.py | 6 +- tools/progressbar_icon_tester.py | 5 +- tools/test-auth-server.py | 8 +- tools/win_installer/misc/create-launcher.py | 6 +- tools/win_installer/misc/depcheck.py | 5 +- 81 files changed, 402 insertions(+), 449 deletions(-) diff --git a/bin/gpo b/bin/gpo index 0929edc6..dfa512aa 100755 --- a/bin/gpo +++ b/bin/gpo @@ -65,20 +65,25 @@ """ -import sys import collections -import os -import re -import inspect -import functools import contextlib +import functools +import inspect +import logging +import os +import pydoc +import re +import shlex +import sys + +import gpodder +from gpodder import common, core, download, log, model, my, opml, util, youtube +from gpodder.config import config_value_to_string + try: import readline except ImportError: readline = None -import shlex -import pydoc -import logging try: import termios @@ -110,7 +115,6 @@ if os.path.exists(os.path.join(src_dir, 'gpodder', '__init__.py')): # Run gPodder from local source folder (not installed) sys.path.insert(0, src_dir) -import gpodder _ = gpodder.gettext N_ = gpodder.ngettext @@ -124,18 +128,8 @@ have_ansi = sys.stdout.isatty() and not gpodder.ui.win32 interactive_console = sys.stdin.isatty() and sys.stdout.isatty() is_single_command = False -from gpodder import log log.setup(verbose) -from gpodder import core -from gpodder import download -from gpodder import my -from gpodder import opml -from gpodder import util -from gpodder import youtube -from gpodder import model -from gpodder import common -from gpodder.config import config_value_to_string def incolor(color_id, s): diff --git a/bin/gpodder b/bin/gpodder index ce9b5bce..54a19553 100755 --- a/bin/gpodder +++ b/bin/gpodder @@ -26,15 +26,13 @@ Soundcloud and Vimeo) and automatically download new content. This is the gPodder GUI. See gpo(1) for the command-line interface. """ -import sys +import gettext +import logging import os import os.path import platform -import logging - -import gettext - import subprocess +import sys logger = logging.getLogger(__name__) diff --git a/bin/gpodder-migrate2tres b/bin/gpodder-migrate2tres index 0c24332c..7cd96fe7 100755 --- a/bin/gpodder-migrate2tres +++ b/bin/gpodder-migrate2tres @@ -24,11 +24,14 @@ # by Thomas Perl ; 2011-04-28 -import sys +import configparser import os import re -import configparser import shutil +import sys + +import gpodder +from gpodder import schema, util gpodder_script = sys.argv[0] gpodder_script = os.path.realpath(gpodder_script) @@ -41,13 +44,10 @@ if os.path.exists(os.path.join(src_dir, 'gpodder', '__init__.py')): # Run gPodder from local source folder (not installed) sys.path.insert(0, src_dir) -import gpodder gpodder.prefix = prefix -from gpodder import schema -from gpodder import util old_database = os.path.expanduser('~/.config/gpodder/database.sqlite') new_database = gpodder.database_file diff --git a/setup.py b/setup.py index fe60ab04..82096a70 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,6 @@ import glob import os import re import sys - from distutils.core import setup installing = ('install' in sys.argv and '--help' not in sys.argv) diff --git a/share/gpodder/examples/gpodder_mark_played.py b/share/gpodder/examples/gpodder_mark_played.py index cc7ded52..1157ea4b 100644 --- a/share/gpodder/examples/gpodder_mark_played.py +++ b/share/gpodder/examples/gpodder_mark_played.py @@ -12,8 +12,8 @@ # # Thomas Perl ; 2009-09-09 -import sys import os +import sys if len(sys.argv) != 2: print(""" diff --git a/share/gpodder/examples/hello_world.py b/share/gpodder/examples/hello_world.py index 8110319f..be4a30b0 100644 --- a/share/gpodder/examples/hello_world.py +++ b/share/gpodder/examples/hello_world.py @@ -1,6 +1,7 @@ # Use a logger for debug output - this will be managed by gPodder. import logging + logger = logging.getLogger(__name__) # Provide some metadata that will be displayed in the gPodder GUI. diff --git a/share/gpodder/extensions/audio_converter.py b/share/gpodder/extensions/audio_converter.py index 1fc0bfd1..280061fb 100644 --- a/share/gpodder/extensions/audio_converter.py +++ b/share/gpodder/extensions/audio_converter.py @@ -6,13 +6,13 @@ # (c) 2011-11-23 Bernd Schlapsi # Released under the same license terms as gPodder itself. +import logging import os import subprocess import gpodder from gpodder import util -import logging logger = logging.getLogger(__name__) _ = gpodder.gettext diff --git a/share/gpodder/extensions/concatenate_videos.py b/share/gpodder/extensions/concatenate_videos.py index 7c93b13f..af1b41f6 100644 --- a/share/gpodder/extensions/concatenate_videos.py +++ b/share/gpodder/extensions/concatenate_videos.py @@ -3,16 +3,16 @@ # 2014-05-03 Thomas Perl # Released under the same license terms as gPodder itself. +import logging +import os import subprocess +from gi.repository import Gtk + import gpodder from gpodder import util - -from gi.repository import Gtk from gpodder.gtkui.interface.progress import ProgressIndicator -import os -import logging logger = logging.getLogger(__name__) _ = gpodder.gettext diff --git a/share/gpodder/extensions/enqueue_in_mediaplayer.py b/share/gpodder/extensions/enqueue_in_mediaplayer.py index 4c38770b..1a17e11d 100644 --- a/share/gpodder/extensions/enqueue_in_mediaplayer.py +++ b/share/gpodder/extensions/enqueue_in_mediaplayer.py @@ -3,12 +3,12 @@ # Requirements: gPodder 3.x (or "tres" branch newer than 2011-06-08) # (c) 2011-06-08 Thomas Perl # Released under the same license terms as gPodder itself. +import logging import subprocess import gpodder from gpodder import util -import logging logger = logging.getLogger(__name__) _ = gpodder.gettext diff --git a/share/gpodder/extensions/episode_website_context_menu.py b/share/gpodder/extensions/episode_website_context_menu.py index e445ad10..4bcf443b 100644 --- a/share/gpodder/extensions/episode_website_context_menu.py +++ b/share/gpodder/extensions/episode_website_context_menu.py @@ -3,10 +3,11 @@ # (c) 2014-10-20 Thomas Perl # Released under the same license terms as gPodder itself. +import logging + import gpodder from gpodder import util -import logging logger = logging.getLogger(__name__) _ = gpodder.gettext diff --git a/share/gpodder/extensions/gtk_statusicon.py b/share/gpodder/extensions/gtk_statusicon.py index 124d2c0e..3f769fc6 100644 --- a/share/gpodder/extensions/gtk_statusicon.py +++ b/share/gpodder/extensions/gtk_statusicon.py @@ -4,9 +4,14 @@ # Thomas Perl ; 2012-07-31 # -import gpodder - import logging +import os.path + +from gi.repository import Gtk + +import gpodder +from gpodder.gtkui import draw + logger = logging.getLogger(__name__) _ = gpodder.gettext @@ -17,10 +22,7 @@ __category__ = 'desktop-integration' __only_for__ = 'gtk' __disable_in__ = 'unity,win32,python3' -from gi.repository import Gtk -import os.path -from gpodder.gtkui import draw DefaultConfig = { 'download_progress_bar': False, # draw progress bar on icon while downloading? diff --git a/share/gpodder/extensions/normalize_audio.py b/share/gpodder/extensions/normalize_audio.py index 505b90bc..68366c15 100644 --- a/share/gpodder/extensions/normalize_audio.py +++ b/share/gpodder/extensions/normalize_audio.py @@ -7,13 +7,13 @@ # (c) 2011-11-06 Bernd Schlapsi # Released under the same license terms as gPodder itself. +import logging import os import subprocess import gpodder from gpodder import util -import logging logger = logging.getLogger(__name__) _ = gpodder.gettext diff --git a/share/gpodder/extensions/notification-win32.py b/share/gpodder/extensions/notification-win32.py index 54ef7df6..3502566f 100755 --- a/share/gpodder/extensions/notification-win32.py +++ b/share/gpodder/extensions/notification-win32.py @@ -44,16 +44,18 @@ __mandatory_in__ = 'win32' __only_for__ = 'win32' import functools +import logging import os import os.path import gi -gi.require_version('Gtk', '3.0') from gi.repository import Gtk import gpodder -import logging +gi.require_version('Gtk', '3.0') + + logger = logging.getLogger(__name__) diff --git a/share/gpodder/extensions/notification.py b/share/gpodder/extensions/notification.py index 70f67521..ecc3b646 100644 --- a/share/gpodder/extensions/notification.py +++ b/share/gpodder/extensions/notification.py @@ -26,9 +26,10 @@ __only_for__ = 'gtk' __mandatory_in__ = 'gtk' __disable_in__ = 'win32' +import logging + import gpodder -import logging logger = logging.getLogger(__name__) try: diff --git a/share/gpodder/extensions/rename_download.py b/share/gpodder/extensions/rename_download.py index 73ffe96d..e71824eb 100644 --- a/share/gpodder/extensions/rename_download.py +++ b/share/gpodder/extensions/rename_download.py @@ -3,13 +3,13 @@ # Copyright (c) 2011-04-04 Thomas Perl # Licensed under the same terms as gPodder itself +import logging import os import gpodder from gpodder import util from gpodder.model import PodcastEpisode -import logging logger = logging.getLogger(__name__) _ = gpodder.gettext diff --git a/share/gpodder/extensions/rm_ogg_cover.py b/share/gpodder/extensions/rm_ogg_cover.py index dd937c8b..6ffc7e3b 100644 --- a/share/gpodder/extensions/rm_ogg_cover.py +++ b/share/gpodder/extensions/rm_ogg_cover.py @@ -23,14 +23,14 @@ # The reason for this script is that my media player (MEIZU SL6) # couldn't handle ogg files with included coverart +import logging import os import gpodder +from mutagen.oggvorbis import OggVorbis -import logging logger = logging.getLogger(__name__) -from mutagen.oggvorbis import OggVorbis _ = gpodder.gettext diff --git a/share/gpodder/extensions/rockbox_convert2mp4.py b/share/gpodder/extensions/rockbox_convert2mp4.py index 2419bf34..22234f09 100644 --- a/share/gpodder/extensions/rockbox_convert2mp4.py +++ b/share/gpodder/extensions/rockbox_convert2mp4.py @@ -10,15 +10,15 @@ # Copyright (c) 2011-04-04 Thomas Perl # Licensed under the same terms as gPodder itself -import kaa.metadata +import logging import os import shlex import subprocess import gpodder +import kaa.metadata from gpodder import util -import logging logger = logging.getLogger(__name__) _ = gpodder.gettext diff --git a/share/gpodder/extensions/rockbox_coverart.py b/share/gpodder/extensions/rockbox_coverart.py index 063df6b7..db6ae486 100644 --- a/share/gpodder/extensions/rockbox_coverart.py +++ b/share/gpodder/extensions/rockbox_coverart.py @@ -3,11 +3,11 @@ # (c) 2014-04-10 Alex Mayer # Released under the same license terms as gPodder itself. +# Use a logger for debug output - this will be managed by gPodder +import logging import os import shutil -# Use a logger for debug output - this will be managed by gPodder -import logging logger = logging.getLogger(__name__) # Provide some metadata that will be displayed in the gPodder GUI diff --git a/share/gpodder/extensions/sonos.py b/share/gpodder/extensions/sonos.py index ae24cd70..4b90bf68 100644 --- a/share/gpodder/extensions/sonos.py +++ b/share/gpodder/extensions/sonos.py @@ -4,16 +4,18 @@ # (c) 2013-01-19 Stefan Kögl # Released under the same license terms as gPodder itself. +import logging from functools import partial +import requests + import gpodder +import soco + _ = gpodder.gettext -import logging logger = logging.getLogger(__name__) -import soco -import requests __title__ = _('Stream to Sonos') diff --git a/share/gpodder/extensions/tagging.py b/share/gpodder/extensions/tagging.py index 04050c48..93140543 100644 --- a/share/gpodder/extensions/tagging.py +++ b/share/gpodder/extensions/tagging.py @@ -25,21 +25,21 @@ import base64 import datetime +import logging import mimetypes import os import gpodder from gpodder import coverart - -import logging -logger = logging.getLogger(__name__) - from mutagen import File from mutagen.flac import Picture +from mutagen.id3 import APIC, ID3 from mutagen.mp3 import MP3 -from mutagen.id3 import ID3, APIC from mutagen.mp4 import MP4Cover, MP4Tags +logger = logging.getLogger(__name__) + + # workaround for https://github.com/quodlibet/mutagen/issues/334 # can't add_tags to MP4 when file has no tag MP4Tags._padding = 0 diff --git a/share/gpodder/extensions/taskbar_progress.py b/share/gpodder/extensions/taskbar_progress.py index a25fac98..70039c45 100755 --- a/share/gpodder/extensions/taskbar_progress.py +++ b/share/gpodder/extensions/taskbar_progress.py @@ -20,7 +20,14 @@ # Windows 7 taskbar progress # Sean Munkel; 2013-01-05 +import functools +import logging +from ctypes import (HRESULT, POINTER, Structure, alignment, c_int, c_uint, + c_ulong, c_ulonglong, c_ushort, c_wchar_p, sizeof) +from ctypes.wintypes import tagRECT + import gpodder +from comtypes import COMMETHOD, GUID, IUnknown, client, wireHWND _ = gpodder.gettext @@ -32,14 +39,7 @@ __category__ = 'desktop-integration' __only_for__ = 'win32' -from ctypes import (c_ushort, c_int, c_uint, c_ulong, c_ulonglong, - c_wchar_p, alignment, sizeof, Structure, POINTER) -from comtypes import IUnknown, GUID, COMMETHOD, wireHWND, client -from ctypes import HRESULT -from ctypes.wintypes import tagRECT -import functools -import logging logger = logging.getLogger(__name__) WSTRING = c_wchar_p diff --git a/share/gpodder/extensions/ted_subtitles.py b/share/gpodder/extensions/ted_subtitles.py index 3a7085e6..4ff161f4 100644 --- a/share/gpodder/extensions/ted_subtitles.py +++ b/share/gpodder/extensions/ted_subtitles.py @@ -1,16 +1,17 @@ # -*- coding: utf-8 -*- # vi:si:et:sw=4:sts=4:ts=4 -import os import json import logging +import os import re - from datetime import timedelta -logger = logging.getLogger(__name__) import gpodder from gpodder import util +logger = logging.getLogger(__name__) + + _ = gpodder.gettext __title__ = _('Subtitle Downloader for TED Talks') diff --git a/share/gpodder/extensions/ubuntu_appindicator.py b/share/gpodder/extensions/ubuntu_appindicator.py index 14a44ae2..e8efb5a5 100644 --- a/share/gpodder/extensions/ubuntu_appindicator.py +++ b/share/gpodder/extensions/ubuntu_appindicator.py @@ -3,6 +3,11 @@ # Ubuntu AppIndicator Icon # Thomas Perl ; 2012-02-24 +import logging + +from gi.repository import Gtk + +import appindicator import gpodder _ = gpodder.gettext @@ -16,10 +21,7 @@ __mandatory_in__ = 'unity' __disable_in__ = 'win32' -import appindicator -from gi.repository import Gtk -import logging logger = logging.getLogger(__name__) diff --git a/share/gpodder/extensions/ubuntu_unity.py b/share/gpodder/extensions/ubuntu_unity.py index c0ad3d33..12ad11fe 100644 --- a/share/gpodder/extensions/ubuntu_unity.py +++ b/share/gpodder/extensions/ubuntu_unity.py @@ -3,6 +3,11 @@ # Ubuntu Unity Launcher Integration # Thomas Perl ; 2012-02-06 +import logging +import os +import subprocess +import sys + import gpodder from gpodder import util @@ -23,10 +28,6 @@ __disable_in__ = 'win32' # this and still expose the same "interface' (LauncherEntry and its methods) # to our callers. -import os -import subprocess -import sys -import logging if __name__ != '__main__': logger = logging.getLogger(__name__) diff --git a/share/gpodder/extensions/update_feeds_on_startup.py b/share/gpodder/extensions/update_feeds_on_startup.py index 203d457e..28cf1251 100644 --- a/share/gpodder/extensions/update_feeds_on_startup.py +++ b/share/gpodder/extensions/update_feeds_on_startup.py @@ -4,9 +4,10 @@ # (c) 2012-10-13 Bernd Schlapsi # Released under the same license terms as gPodder itself. +import logging + import gpodder -import logging logger = logging.getLogger(__name__) _ = gpodder.gettext diff --git a/share/gpodder/extensions/video_converter.py b/share/gpodder/extensions/video_converter.py index 8082f893..7a17a3bd 100644 --- a/share/gpodder/extensions/video_converter.py +++ b/share/gpodder/extensions/video_converter.py @@ -6,15 +6,13 @@ # (c) 2011-08-05 Thomas Perl # Released under the same license terms as gPodder itself. +import logging import os import subprocess import gpodder +from gpodder import util, youtube -from gpodder import util -from gpodder import youtube - -import logging logger = logging.getLogger(__name__) _ = gpodder.gettext diff --git a/src/gpodder/common.py b/src/gpodder/common.py index 5655cd29..f672941d 100644 --- a/src/gpodder/common.py +++ b/src/gpodder/common.py @@ -21,14 +21,13 @@ # Thomas Perl ; 2012-08-16 -import gpodder - -from gpodder import util - import glob +import logging import os -import logging +import gpodder +from gpodder import util + logger = logging.getLogger(__name__) diff --git a/src/gpodder/config.py b/src/gpodder/config.py index ef390c12..369128f8 100644 --- a/src/gpodder/config.py +++ b/src/gpodder/config.py @@ -24,15 +24,14 @@ # -import gpodder -from gpodder import util -from gpodder import jsonconfig - import atexit +import logging import os import shutil import time -import logging + +import gpodder +from gpodder import jsonconfig, util _ = gpodder.gettext diff --git a/src/gpodder/core.py b/src/gpodder/core.py index 037af13c..f3353847 100644 --- a/src/gpodder/core.py +++ b/src/gpodder/core.py @@ -22,12 +22,7 @@ import gpodder - -from gpodder import util -from gpodder import config -from gpodder import dbsqlite -from gpodder import extensions -from gpodder import model +from gpodder import config, dbsqlite, extensions, model, util class Core(object): diff --git a/src/gpodder/coverart.py b/src/gpodder/coverart.py index 83a9e3f5..96602c57 100644 --- a/src/gpodder/coverart.py +++ b/src/gpodder/coverart.py @@ -23,16 +23,17 @@ # +import logging +import os + import gpodder +from gpodder import util, youtube + _ = gpodder.gettext -import logging logger = logging.getLogger(__name__) -from gpodder import util -from gpodder import youtube -import os class CoverDownloader(object): diff --git a/src/gpodder/dbsqlite.py b/src/gpodder/dbsqlite.py index 48b6870e..7d4f2ca4 100644 --- a/src/gpodder/dbsqlite.py +++ b/src/gpodder/dbsqlite.py @@ -24,21 +24,22 @@ # 2010-04-24 Thomas Perl # -import gpodder -_ = gpodder.gettext - +import logging +import re import sys - +import threading from sqlite3 import dbapi2 as sqlite -import logging +import gpodder +from gpodder import schema, util + +_ = gpodder.gettext + + + logger = logging.getLogger(__name__) -from gpodder import schema -from gpodder import util -import threading -import re class Database(object): diff --git a/src/gpodder/dbusproxy.py b/src/gpodder/dbusproxy.py index 39701530..8a183fa9 100644 --- a/src/gpodder/dbusproxy.py +++ b/src/gpodder/dbusproxy.py @@ -22,13 +22,12 @@ # Based on a patch by Iwan van der Kleijn # See also: http://gpodder.org/bug/699 -import gpodder - -from gpodder import util - import dbus import dbus.service +import gpodder +from gpodder import util + def safe_str(txt): if txt: diff --git a/src/gpodder/directory.py b/src/gpodder/directory.py index 3bbfe736..dc3f2778 100644 --- a/src/gpodder/directory.py +++ b/src/gpodder/directory.py @@ -23,18 +23,18 @@ # Thomas Perl ; 2014-10-22 # -import gpodder - -_ = gpodder.gettext - import json import os import urllib.error import urllib.parse import urllib.request -from gpodder import opml -from gpodder import util +import gpodder +from gpodder import opml, util + +_ = gpodder.gettext + + class DirectoryEntry(object): diff --git a/src/gpodder/download.py b/src/gpodder/download.py index 870c27fc..6be7a65b 100644 --- a/src/gpodder/download.py +++ b/src/gpodder/download.py @@ -25,31 +25,30 @@ # Based on libwget.py (2005-10-29) # +import collections +import email import logging -logger = logging.getLogger(__name__) - -from gpodder import util -from gpodder import youtube -from gpodder import vimeo -from gpodder import escapist_videos -import gpodder - +import mimetypes +import os +import os.path +import shutil import socket import threading -import shutil -import os.path -import os import time -import collections - -import mimetypes -import email import urllib.error import urllib.parse import urllib.request - from email.header import decode_header +import gpodder +from gpodder import escapist_videos, util, vimeo, youtube + +logger = logging.getLogger(__name__) + + + + + _ = gpodder.gettext diff --git a/src/gpodder/escapist_videos.py b/src/gpodder/escapist_videos.py index 5e91643e..792a764f 100644 --- a/src/gpodder/escapist_videos.py +++ b/src/gpodder/escapist_videos.py @@ -23,20 +23,20 @@ # -import gpodder - -from gpodder import util - -import logging -logger = logging.getLogger(__name__) - import json - +import logging import re import urllib.error import urllib.parse import urllib.request +import gpodder +from gpodder import util + +logger = logging.getLogger(__name__) + + + # This matches the more reliable URL 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 diff --git a/src/gpodder/extensions.py b/src/gpodder/extensions.py index 99c0b0fc..109c43be 100644 --- a/src/gpodder/extensions.py +++ b/src/gpodder/extensions.py @@ -29,25 +29,25 @@ their parameters. For an example extension see share/gpodder/examples/extensions.py """ +import functools import glob import imp import inspect import json +import logging import os -import functools +import re import shlex import subprocess import sys -import re from datetime import datetime import gpodder +from gpodder import util _ = gpodder.gettext -from gpodder import util -import logging logger = logging.getLogger(__name__) diff --git a/src/gpodder/feedcore.py b/src/gpodder/feedcore.py index 6c0e83bc..ec90c3e5 100644 --- a/src/gpodder/feedcore.py +++ b/src/gpodder/feedcore.py @@ -22,16 +22,16 @@ # Thomas Perl ; 2009-06-11 # -import podcastparser +import logging +import urllib.parse +from html.parser import HTMLParser +from urllib.error import HTTPError +import podcastparser from gpodder import util -import logging logger = logging.getLogger(__name__) -from urllib.error import HTTPError -from html.parser import HTMLParser -import urllib.parse try: # Python 2 diff --git a/src/gpodder/feedservice.py b/src/gpodder/feedservice.py index a998aa60..60255d50 100644 --- a/src/gpodder/feedservice.py +++ b/src/gpodder/feedservice.py @@ -17,9 +17,10 @@ # along with this program. If not, see . # +import logging + from mygpoclient import feeds -import logging logger = logging.getLogger(__name__) diff --git a/src/gpodder/gtkui/base.py b/src/gpodder/gtkui/base.py index 833c35ce..b30e4110 100644 --- a/src/gpodder/gtkui/base.py +++ b/src/gpodder/gtkui/base.py @@ -21,9 +21,8 @@ Based on SimpleGladeApp.py Copyright (C) 2004 Sandino Flores Moreno # USA import os -import sys import re - +import sys import tokenize from gi.repository import Gtk diff --git a/src/gpodder/gtkui/config.py b/src/gpodder/gtkui/config.py index 1bd6e212..a309240f 100644 --- a/src/gpodder/gtkui/config.py +++ b/src/gpodder/gtkui/config.py @@ -23,13 +23,10 @@ # -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import Pango +from gi.repository import Gdk, Gtk, Pango import gpodder -from gpodder import util -from gpodder import config +from gpodder import config, util _ = gpodder.gettext diff --git a/src/gpodder/gtkui/desktop/channel.py b/src/gpodder/gtkui/desktop/channel.py index a1f3bcf3..6c076d84 100644 --- a/src/gpodder/gtkui/desktop/channel.py +++ b/src/gpodder/gtkui/desktop/channel.py @@ -17,17 +17,15 @@ # along with this program. If not, see . # -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GdkPixbuf +from gi.repository import Gdk, GdkPixbuf, Gtk import gpodder +from gpodder import util +from gpodder.gtkui.interface.common import BuilderWidget _ = gpodder.gettext -from gpodder import util -from gpodder.gtkui.interface.common import BuilderWidget class gPodderChannel(BuilderWidget): diff --git a/src/gpodder/gtkui/desktop/deviceplaylist.py b/src/gpodder/gtkui/desktop/deviceplaylist.py index 7b26ec72..5d321305 100644 --- a/src/gpodder/gtkui/desktop/deviceplaylist.py +++ b/src/gpodder/gtkui/desktop/deviceplaylist.py @@ -17,15 +17,17 @@ # along with this program. If not, see . # +import logging import os + import gpodder +from gpodder import util +from gpodder.sync import (episode_filename_on_device, + episode_foldername_on_device) _ = gpodder.gettext -from gpodder import util -from gpodder.sync import episode_filename_on_device, episode_foldername_on_device -import logging logger = logging.getLogger(__name__) diff --git a/src/gpodder/gtkui/desktop/episodeselector.py b/src/gpodder/gtkui/desktop/episodeselector.py index b416d8fc..e1e572ce 100644 --- a/src/gpodder/gtkui/desktop/episodeselector.py +++ b/src/gpodder/gtkui/desktop/episodeselector.py @@ -17,18 +17,16 @@ # along with this program. If not, see . # -from gi.repository import Gtk -from gi.repository import Pango +from gi.repository import Gtk, Pango import gpodder +from gpodder import util +from gpodder.gtkui.interface.common import BuilderWidget, TreeViewHelper _ = gpodder.gettext N_ = gpodder.ngettext -from gpodder import util -from gpodder.gtkui.interface.common import BuilderWidget -from gpodder.gtkui.interface.common import TreeViewHelper class gPodderEpisodeSelector(BuilderWidget): diff --git a/src/gpodder/gtkui/desktop/podcastdirectory.py b/src/gpodder/gtkui/desktop/podcastdirectory.py index 4d2507ba..7fc9860d 100644 --- a/src/gpodder/gtkui/desktop/podcastdirectory.py +++ b/src/gpodder/gtkui/desktop/podcastdirectory.py @@ -24,26 +24,24 @@ # -from gi.repository import Gtk -from gi.repository import GdkPixbuf -from gi.repository import Pango import cgi +import logging import os +from gi.repository import GdkPixbuf, Gtk, Pango + import gpodder - -_ = gpodder.gettext - -import logging -logger = logging.getLogger(__name__) - -from gpodder import util -from gpodder import directory - +from gpodder import directory, util from gpodder.gtkui.interface.common import BuilderWidget from gpodder.gtkui.interface.progress import ProgressIndicator from gpodder.gtkui.interface.tagcloud import TagCloud +_ = gpodder.gettext + +logger = logging.getLogger(__name__) + + + class DirectoryPodcastsModel(Gtk.ListStore): C_SELECTED, C_MARKUP, C_TITLE, C_URL = list(range(4)) diff --git a/src/gpodder/gtkui/desktop/preferences.py b/src/gpodder/gtkui/desktop/preferences.py index 95f8039c..e6902d27 100644 --- a/src/gpodder/gtkui/desktop/preferences.py +++ b/src/gpodder/gtkui/desktop/preferences.py @@ -17,29 +17,26 @@ # along with this program. If not, see . # -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import Pango import cgi +import logging import urllib.parse -import logging -logger = logging.getLogger(__name__) +from gi.repository import Gdk, Gtk, Pango import gpodder +from gpodder import util, vimeo, youtube +from gpodder.gtkui.desktopfile import PlayerListModel +from gpodder.gtkui.interface.common import BuilderWidget, TreeViewHelper +from gpodder.gtkui.interface.configeditor import gPodderConfigEditor + +logger = logging.getLogger(__name__) + _ = gpodder.gettext N_ = gpodder.ngettext -from gpodder import util -from gpodder import youtube -from gpodder import vimeo -from gpodder.gtkui.interface.common import BuilderWidget -from gpodder.gtkui.interface.common import TreeViewHelper -from gpodder.gtkui.interface.configeditor import gPodderConfigEditor -from gpodder.gtkui.desktopfile import PlayerListModel class NewEpisodeActionList(Gtk.ListStore): diff --git a/src/gpodder/gtkui/desktop/sync.py b/src/gpodder/gtkui/desktop/sync.py index 3865d831..ed7b9129 100644 --- a/src/gpodder/gtkui/desktop/sync.py +++ b/src/gpodder/gtkui/desktop/sync.py @@ -21,17 +21,17 @@ # Thomas Perl ; 2009-09-05 (based on code from gui.py) # Ported to gPodder 3 by Joseph Wickremasinghe in June 2012 +import logging import os + import gpodder +from gpodder import sync, util +from gpodder.gtkui.desktop.deviceplaylist import gPodderDevicePlaylist +from gpodder.gtkui.desktop.episodeselector import gPodderEpisodeSelector _ = gpodder.gettext -from gpodder import util -from gpodder import sync -from gpodder.gtkui.desktop.episodeselector import gPodderEpisodeSelector -from gpodder.gtkui.desktop.deviceplaylist import gPodderDevicePlaylist -import logging logger = logging.getLogger(__name__) diff --git a/src/gpodder/gtkui/desktop/welcome.py b/src/gpodder/gtkui/desktop/welcome.py index 992d141d..a5a459eb 100644 --- a/src/gpodder/gtkui/desktop/welcome.py +++ b/src/gpodder/gtkui/desktop/welcome.py @@ -20,10 +20,10 @@ from gi.repository import Gtk import gpodder +from gpodder.gtkui.interface.common import BuilderWidget _ = gpodder.gettext -from gpodder.gtkui.interface.common import BuilderWidget class gPodderWelcome(BuilderWidget): diff --git a/src/gpodder/gtkui/desktopfile.py b/src/gpodder/gtkui/desktopfile.py index b275f05e..f305ccdd 100644 --- a/src/gpodder/gtkui/desktopfile.py +++ b/src/gpodder/gtkui/desktopfile.py @@ -25,22 +25,19 @@ # import glob -import re +import logging import os import os.path +import re import threading - from configparser import RawConfigParser -from gi.repository import GObject -from gi.repository import GdkPixbuf -from gi.repository import Gtk +from gi.repository import GdkPixbuf, GObject, Gtk import gpodder _ = gpodder.gettext -import logging logger = logging.getLogger(__name__) # where are the .desktop files located? diff --git a/src/gpodder/gtkui/download.py b/src/gpodder/gtkui/download.py index c33bdd6b..5fdd967d 100644 --- a/src/gpodder/gtkui/download.py +++ b/src/gpodder/gtkui/download.py @@ -23,17 +23,15 @@ # Based on code from gpodder.services (thp, 2007-08-24) # -import gpodder - -from gpodder import util -from gpodder import download - -from gi.repository import Gtk import cgi - import collections import threading +from gi.repository import Gtk + +import gpodder +from gpodder import download, util + _ = gpodder.gettext diff --git a/src/gpodder/gtkui/draw.py b/src/gpodder/gtkui/draw.py index 239db533..9e60c509 100644 --- a/src/gpodder/gtkui/draw.py +++ b/src/gpodder/gtkui/draw.py @@ -23,22 +23,20 @@ # Thomas Perl , 2007-11-25 # -import gpodder - -import gi -gi.require_version('PangoCairo', '1.0') - -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GdkPixbuf -from gi.repository import Pango -from gi.repository import PangoCairo - -import cairo - import io import math +import cairo +import gi +from gi.repository import Gdk, GdkPixbuf, Gtk, Pango, PangoCairo + +import gpodder + +gi.require_version('PangoCairo', '1.0') + + + + class TextExtents(object): def __init__(self, ctx, text): diff --git a/src/gpodder/gtkui/interface/addpodcast.py b/src/gpodder/gtkui/interface/addpodcast.py index c75027a4..b3265d69 100644 --- a/src/gpodder/gtkui/interface/addpodcast.py +++ b/src/gpodder/gtkui/interface/addpodcast.py @@ -17,16 +17,15 @@ # along with this program. If not, see . # -from gi.repository import Gtk -from gi.repository import Gdk +from gi.repository import Gdk, Gtk import gpodder +from gpodder import util +from gpodder.gtkui.interface.common import BuilderWidget _ = gpodder.gettext -from gpodder.gtkui.interface.common import BuilderWidget -from gpodder import util class gPodderAddPodcast(BuilderWidget): diff --git a/src/gpodder/gtkui/interface/common.py b/src/gpodder/gtkui/interface/common.py index e12393fc..3290bc1b 100644 --- a/src/gpodder/gtkui/interface/common.py +++ b/src/gpodder/gtkui/interface/common.py @@ -17,19 +17,18 @@ # along with this program. If not, see . # -from gi.repository import Gtk -from gi.repository import Gdk - import os import shutil +from gi.repository import Gdk, Gtk + import gpodder +from gpodder import util +from gpodder.gtkui.base import GtkBuilderWidget _ = gpodder.gettext -from gpodder import util -from gpodder.gtkui.base import GtkBuilderWidget class BuilderWidget(GtkBuilderWidget): diff --git a/src/gpodder/gtkui/interface/configeditor.py b/src/gpodder/gtkui/interface/configeditor.py index 03cd7afc..c3c1957a 100644 --- a/src/gpodder/gtkui/interface/configeditor.py +++ b/src/gpodder/gtkui/interface/configeditor.py @@ -17,16 +17,17 @@ # along with this program. If not, see . # -from gi.repository import Gtk import cgi +from gi.repository import Gtk + import gpodder +from gpodder.gtkui.config import ConfigModel +from gpodder.gtkui.interface.common import BuilderWidget _ = gpodder.gettext -from gpodder.gtkui.config import ConfigModel -from gpodder.gtkui.interface.common import BuilderWidget class gPodderConfigEditor(BuilderWidget): diff --git a/src/gpodder/gtkui/interface/progress.py b/src/gpodder/gtkui/interface/progress.py index 37f9bb07..6ee9c0bf 100644 --- a/src/gpodder/gtkui/interface/progress.py +++ b/src/gpodder/gtkui/interface/progress.py @@ -17,15 +17,13 @@ # along with this program. If not, see . # -from gi.repository import Gtk -from gi.repository import GObject -from gi.repository import Pango +from gi.repository import GObject, Gtk, Pango import gpodder +from gpodder.gtkui.widgets import SpinningProgressIndicator _ = gpodder.gettext -from gpodder.gtkui.widgets import SpinningProgressIndicator class ProgressIndicator(object): diff --git a/src/gpodder/gtkui/interface/tagcloud.py b/src/gpodder/gtkui/interface/tagcloud.py index ec49f85c..226d9ebb 100644 --- a/src/gpodder/gtkui/interface/tagcloud.py +++ b/src/gpodder/gtkui/interface/tagcloud.py @@ -18,10 +18,10 @@ # -from gi.repository import Gtk -from gi.repository import GObject import cgi +from gi.repository import GObject, Gtk + class TagCloud(Gtk.Layout): __gsignals__ = { diff --git a/src/gpodder/gtkui/main.py b/src/gpodder/gtkui/main.py index 77e0237a..019e1eed 100644 --- a/src/gpodder/gtkui/main.py +++ b/src/gpodder/gtkui/main.py @@ -17,86 +17,72 @@ # along with this program. If not, see . # +import cgi +import collections +import glob +import logging import os import platform -import gi -gi.require_version('Gtk', '3.0') -from gi.repository import Gio -from gi.repository import GLib -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GdkPixbuf -from gi.repository import GObject -from gi.repository import Pango import random import re -import sys import shutil import subprocess -import glob -import time -import threading +import sys import tempfile -import collections +import threading +import time import urllib.error import urllib.parse import urllib.request -import cgi - - -import gpodder import dbus -import dbus.service -import dbus.mainloop import dbus.glib +import dbus.mainloop +import dbus.service +import gi +from gi.repository import Gdk, GdkPixbuf, Gio, GLib, GObject, Gtk, Pango + +import gpodder +from gpodder import (common, core, download, extensions, feedcore, my, opml, + player, util, youtube) +from gpodder.dbusproxy import DBusPodcastsProxy +from gpodder.gtkui import shownotes +from gpodder.gtkui.config import UIConfig +from gpodder.gtkui.desktop.channel import gPodderChannel +from gpodder.gtkui.desktop.episodeselector import gPodderEpisodeSelector +from gpodder.gtkui.desktop.podcastdirectory import gPodderPodcastDirectory +from gpodder.gtkui.desktop.preferences import gPodderPreferences +from gpodder.gtkui.desktop.sync import gPodderSyncUI +from gpodder.gtkui.desktop.welcome import gPodderWelcome +from gpodder.gtkui.desktopfile import UserAppsReader +from gpodder.gtkui.download import DownloadStatusModel +from gpodder.gtkui.draw import (EPISODE_LIST_ICON_SIZE, draw_cake_pixbuf, + draw_text_box_centered) +from gpodder.gtkui.interface.addpodcast import gPodderAddPodcast +from gpodder.gtkui.interface.common import BuilderWidget, TreeViewHelper +from gpodder.gtkui.interface.progress import ProgressIndicator +from gpodder.gtkui.model import EpisodeListModel, Model, PodcastListModel +from gpodder.gtkui.services import CoverDownloader +from gpodder.gtkui.widgets import SimpleMessageArea +from gpodder.model import PodcastEpisode, check_root_folder_path + +gi.require_version('Gtk', '3.0') + + + -from gpodder import core -from gpodder import feedcore -from gpodder import util -from gpodder import opml -from gpodder import download -from gpodder import my -from gpodder import youtube -from gpodder import player -from gpodder import common -from gpodder.model import check_root_folder_path, PodcastEpisode -import logging logger = logging.getLogger(__name__) _ = gpodder.gettext N_ = gpodder.ngettext -from gpodder.gtkui.model import Model -from gpodder.gtkui.model import PodcastListModel -from gpodder.gtkui.model import EpisodeListModel -from gpodder.gtkui.config import UIConfig -from gpodder.gtkui.services import CoverDownloader -from gpodder.gtkui.widgets import SimpleMessageArea -from gpodder.gtkui.desktopfile import UserAppsReader -from gpodder.gtkui.draw import draw_text_box_centered, draw_cake_pixbuf -from gpodder.gtkui.draw import EPISODE_LIST_ICON_SIZE -from gpodder.gtkui.interface.common import BuilderWidget -from gpodder.gtkui.interface.common import TreeViewHelper -from gpodder.gtkui.interface.addpodcast import gPodderAddPodcast -from gpodder.gtkui.download import DownloadStatusModel -from gpodder.gtkui.desktop.welcome import gPodderWelcome -from gpodder.gtkui.desktop.channel import gPodderChannel -from gpodder.gtkui.desktop.preferences import gPodderPreferences -from gpodder.gtkui.desktop.episodeselector import gPodderEpisodeSelector -from gpodder.gtkui.desktop.podcastdirectory import gPodderPodcastDirectory -from gpodder.gtkui.interface.progress import ProgressIndicator -from gpodder.gtkui.desktop.sync import gPodderSyncUI -from gpodder.gtkui import shownotes -from gpodder.dbusproxy import DBusPodcastsProxy -from gpodder import extensions class gPodder(BuilderWidget, dbus.service.Object): diff --git a/src/gpodder/gtkui/model.py b/src/gpodder/gtkui/model.py index d75cbe81..28a5e87d 100644 --- a/src/gpodder/gtkui/model.py +++ b/src/gpodder/gtkui/model.py @@ -23,27 +23,24 @@ # Based on code from libpodcasts.py (thp, 2005-10-29) # +import cgi +import logging +import os +import re +import time + +from gi.repository import GdkPixbuf, GObject, Gtk + import gpodder +from gpodder import coverart, model, query, util +from gpodder.gtkui import draw _ = gpodder.gettext -from gpodder import util -from gpodder import model -from gpodder import query -from gpodder import coverart -import logging logger = logging.getLogger(__name__) -from gpodder.gtkui import draw -import os -from gi.repository import Gtk -from gi.repository import GObject -from gi.repository import GdkPixbuf -import cgi -import re -import time try: from gi.repository import Gio diff --git a/src/gpodder/gtkui/services.py b/src/gpodder/gtkui/services.py index 69de8553..94a346ad 100644 --- a/src/gpodder/gtkui/services.py +++ b/src/gpodder/gtkui/services.py @@ -23,19 +23,20 @@ # -import gpodder -_ = gpodder.gettext +import logging +from gi.repository import GdkPixbuf, Gtk + +import gpodder +from gpodder import coverart, util from gpodder.services import ObservableService -import logging +_ = gpodder.gettext + + logger = logging.getLogger(__name__) -from gpodder import util -from gpodder import coverart -from gi.repository import Gtk -from gi.repository import GdkPixbuf class CoverDownloader(ObservableService): diff --git a/src/gpodder/gtkui/shownotes.py b/src/gpodder/gtkui/shownotes.py index 493e5e7d..71532559 100644 --- a/src/gpodder/gtkui/shownotes.py +++ b/src/gpodder/gtkui/shownotes.py @@ -16,20 +16,16 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -from urllib.parse import urlparse - -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import Pango - import html import logging +from urllib.parse import urlparse + +from gi.repository import Gdk, Gtk, Pango import gpodder - from gpodder import util -from gpodder.gtkui.draw import draw_text_box_centered, \ - get_background_color, get_foreground_color +from gpodder.gtkui.draw import (draw_text_box_centered, get_background_color, + get_foreground_color) _ = gpodder.gettext diff --git a/src/gpodder/gtkui/widgets.py b/src/gpodder/gtkui/widgets.py index a68bd0ca..32b543bc 100644 --- a/src/gpodder/gtkui/widgets.py +++ b/src/gpodder/gtkui/widgets.py @@ -24,13 +24,10 @@ # Thomas Perl 2009-03-31 # -from gi.repository import Gdk -from gi.repository import Gtk -from gi.repository import GObject -from gi.repository import Pango - import cgi +from gi.repository import Gdk, GObject, Gtk, Pango + class SimpleMessageArea(Gtk.HBox): """A simple, yellow message area. Inspired by gedit. diff --git a/src/gpodder/jsonconfig.py b/src/gpodder/jsonconfig.py index a1949d77..a58aeebd 100644 --- a/src/gpodder/jsonconfig.py +++ b/src/gpodder/jsonconfig.py @@ -24,9 +24,8 @@ # import copy -from functools import reduce - import json +from functools import reduce class JsonConfigSubtree(object): diff --git a/src/gpodder/log.py b/src/gpodder/log.py index 4e4824de..8c62be11 100644 --- a/src/gpodder/log.py +++ b/src/gpodder/log.py @@ -22,8 +22,6 @@ # Based on an initial draft by Neal Walfield -import gpodder - import glob import logging import os @@ -31,6 +29,8 @@ import sys import time import traceback +import gpodder + logger = logging.getLogger(__name__) diff --git a/src/gpodder/model.py b/src/gpodder/model.py index 82d0ea50..b784bf44 100644 --- a/src/gpodder/model.py +++ b/src/gpodder/model.py @@ -24,29 +24,25 @@ # Based on libpodcasts.py (thp, 2005-10-29) # -import gpodder -from gpodder import util -from gpodder import feedcore -from gpodder import youtube -from gpodder import vimeo -from gpodder import escapist_videos -from gpodder import schema -from gpodder import coverart - +import collections +import datetime +import glob +import hashlib import logging -logger = logging.getLogger(__name__) - import os import re -import glob import shutil -import time -import datetime - -import hashlib -import podcastparser -import collections import string +import time + +import gpodder +import podcastparser +from gpodder import (coverart, escapist_videos, feedcore, schema, util, vimeo, + youtube) + +logger = logging.getLogger(__name__) + + _ = gpodder.gettext diff --git a/src/gpodder/my.py b/src/gpodder/my.py index 080eb8a8..fc25b3c5 100644 --- a/src/gpodder/my.py +++ b/src/gpodder/my.py @@ -24,24 +24,25 @@ # Thomas Perl ; 2010-01-19 # -import gpodder -_ = gpodder.gettext - import atexit -import datetime import calendar +import datetime +import logging import os import sys import time -import logging -logger = logging.getLogger(__name__) - -from gpodder import util -from gpodder import minidb - +import gpodder # Append gPodder's user agent to mygpoclient's user agent import mygpoclient +from gpodder import minidb, util + +_ = gpodder.gettext + + +logger = logging.getLogger(__name__) + + mygpoclient.user_agent += ' ' + gpodder.user_agent # 2013-02-08: We should update this to 1.7 once we use the new features diff --git a/src/gpodder/opml.py b/src/gpodder/opml.py index d57a60b7..c088ed12 100644 --- a/src/gpodder/opml.py +++ b/src/gpodder/opml.py @@ -35,18 +35,20 @@ or distribute gPodder's channel subscriptions. """ import logging -logger = logging.getLogger(__name__) +import os +import os.path +import shutil +import xml.dom.minidom +from email.utils import formatdate +import gpodder from gpodder import util -import xml.dom.minidom +logger = logging.getLogger(__name__) + + -import os.path -import os -import shutil -from email.utils import formatdate -import gpodder class Importer(object): diff --git a/src/gpodder/query.py b/src/gpodder/query.py index 114cccd4..a8ab58e4 100644 --- a/src/gpodder/query.py +++ b/src/gpodder/query.py @@ -22,10 +22,10 @@ # gpodder.query - Episode Query Language (EQL) implementation (2010-11-29) # -import gpodder - -import re import datetime +import re + +import gpodder class Matcher(object): diff --git a/src/gpodder/schema.py b/src/gpodder/schema.py index c174ed19..e6c582ef 100644 --- a/src/gpodder/schema.py +++ b/src/gpodder/schema.py @@ -20,15 +20,15 @@ # gpodder.schema - Database schema update and migration facility # Thomas Perl ; 2011-02-01 +import logging +import shutil +import time from sqlite3 import dbapi2 as sqlite -import time -import shutil +from gpodder import util -import logging logger = logging.getLogger(__name__) -from gpodder import util EpisodeColumns = ( 'podcast_id', diff --git a/src/gpodder/services.py b/src/gpodder/services.py index fbc5068a..89b2f101 100644 --- a/src/gpodder/services.py +++ b/src/gpodder/services.py @@ -25,10 +25,10 @@ # import gpodder +from gpodder import util _ = gpodder.gettext -from gpodder import util class ObservableService(object): diff --git a/src/gpodder/sync.py b/src/gpodder/sync.py index 715309ec..c7abcff5 100644 --- a/src/gpodder/sync.py +++ b/src/gpodder/sync.py @@ -23,16 +23,17 @@ # based on libipodsync.py (2006-04-05 Thomas Perl) # Ported to gPodder 3 by Joseph Wickremasinghe in June 2012 -import gpodder - -from gpodder import util -from gpodder import services -from gpodder import download - +import calendar +import glob import logging +import os.path +import time + +import gpodder +from gpodder import download, services, util + logger = logging.getLogger(__name__) -import calendar _ = gpodder.gettext @@ -60,9 +61,6 @@ try: except: logger.warning('Could not find eyed3.mp3') -import os.path -import glob -import time if pymtp_available: class MTP(pymtp.MTP): diff --git a/src/gpodder/test/model.py b/src/gpodder/test/model.py index 06f5b333..a3468eec 100644 --- a/src/gpodder/test/model.py +++ b/src/gpodder/test/model.py @@ -24,7 +24,6 @@ import unittest import gpodder - from gpodder import model diff --git a/src/gpodder/unittests.py b/src/gpodder/unittests.py index 6dcebfb1..c681e79a 100644 --- a/src/gpodder/unittests.py +++ b/src/gpodder/unittests.py @@ -23,8 +23,8 @@ import doctest -import unittest import sys +import unittest try: # Unused here locally, but we import it to be able to give an early diff --git a/src/gpodder/util.py b/src/gpodder/util.py index 0d544f57..29876059 100644 --- a/src/gpodder/util.py +++ b/src/gpodder/util.py @@ -29,44 +29,45 @@ This module provides helper and utility functions for gPodder that are not tied to any specific part of gPodder. """ +import collections +import datetime +import glob +import gzip +import http.client +import io +import itertools import json - -import gpodder - +import locale import logging -logger = logging.getLogger(__name__) - +import mimetypes import os import os.path import platform -import glob -import stat +import re import shlex import shutil import socket -import sys +import stat import string - -import re import subprocess -from html.entities import entitydefs -import time -import gzip -import datetime +import sys import threading - -import http.client -import webbrowser -import mimetypes -import itertools +import time import urllib.error import urllib.parse import urllib.request - -import io +import webbrowser import xml.dom.minidom +from html.entities import entitydefs + +import gpodder + +logger = logging.getLogger(__name__) + + + + -import collections if sys.hexversion < 0x03000000: from html.parser import HTMLParser @@ -92,7 +93,6 @@ _ = gpodder.gettext N_ = gpodder.ngettext -import locale try: locale.setlocale(locale.LC_ALL, '') except Exception as e: diff --git a/src/gpodder/utilwin32ctypes.py b/src/gpodder/utilwin32ctypes.py index e81171df..8d2a1de3 100644 --- a/src/gpodder/utilwin32ctypes.py +++ b/src/gpodder/utilwin32ctypes.py @@ -19,14 +19,14 @@ # import ctypes -from ctypes import c_ulonglong, HRESULT, Structure -from ctypes.wintypes import (BOOL, BYTE, DWORD, HANDLE, LPCWSTR, MAX_PATH, PULARGE_INTEGER, WORD) +from ctypes import HRESULT, Structure, c_ulonglong +from ctypes.wintypes import (BOOL, BYTE, DWORD, HANDLE, LPCWSTR, MAX_PATH, + PULARGE_INTEGER, WORD) from uuid import UUID from win32ctypes.core.ctypes._common import byreference from win32ctypes.core.ctypes._util import check_zero, function_factory - # Use a local copy of dlls. kernel32 = ctypes.WinDLL('kernel32') shell32 = ctypes.WinDLL('shell32') diff --git a/src/gpodder/utilwin32locale.py b/src/gpodder/utilwin32locale.py index c613959e..760a554f 100644 --- a/src/gpodder/utilwin32locale.py +++ b/src/gpodder/utilwin32locale.py @@ -45,14 +45,12 @@ __version__ = '0.0.3' __docformat__ = 'restructuredtext' +import gettext +import locale import os import sys -import locale -import gettext - from logging import getLogger - logger = getLogger(__name__) diff --git a/src/gpodder/vimeo.py b/src/gpodder/vimeo.py index 7d7d0d31..ac483236 100644 --- a/src/gpodder/vimeo.py +++ b/src/gpodder/vimeo.py @@ -23,18 +23,19 @@ # +import json +import logging +import re + import gpodder +from gpodder import util _ = gpodder.gettext -from gpodder import util -import logging logger = logging.getLogger(__name__) -import json -import re 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) diff --git a/src/gpodder/youtube.py b/src/gpodder/youtube.py index 8a844ad6..5017c901 100644 --- a/src/gpodder/youtube.py +++ b/src/gpodder/youtube.py @@ -20,14 +20,16 @@ # Justin Forest 2008-10-13 # -from urllib.parse import parse_qs -from gpodder import util -from html.parser import HTMLParser import json +import logging import re import urllib import xml.etree.ElementTree -import logging +from html.parser import HTMLParser +from urllib.parse import parse_qs + +from gpodder import util + logger = logging.getLogger(__name__) # http://en.wikipedia.org/wiki/YouTube#Quality_and_codecs diff --git a/tools/i18n/summary.py b/tools/i18n/summary.py index 0ecd3c71..83235e6c 100644 --- a/tools/i18n/summary.py +++ b/tools/i18n/summary.py @@ -5,12 +5,12 @@ # Usage: make statistics | python summary.py # -import sys -import re -import math import glob +import math import os +import re import subprocess +import sys width = 40 diff --git a/tools/progressbar_icon_tester.py b/tools/progressbar_icon_tester.py index 2370e319..7ffea02b 100644 --- a/tools/progressbar_icon_tester.py +++ b/tools/progressbar_icon_tester.py @@ -6,12 +6,15 @@ # Thomas Perl ; 2009-09-13 import sys -sys.path.insert(0, 'src') from gi.repository import Gtk from gpodder.gtkui.draw import draw_cake_pixbuf +sys.path.insert(0, 'src') + + + def gen(percentage): pixbuf = draw_cake_pixbuf(percentage) diff --git a/tools/test-auth-server.py b/tools/test-auth-server.py index bd6f0b82..027cd394 100644 --- a/tools/test-auth-server.py +++ b/tools/test-auth-server.py @@ -4,11 +4,11 @@ # from our crappy-but-does-the-job department # Thomas Perl ; 2012-01-20 -import http.server -import sys -import re -import hashlib import datetime +import hashlib +import http.server +import re +import sys USERNAME = 'user@example.com' # Username used for HTTP Authentication PASSWORD = 'secret' # Password used for HTTP Authentication diff --git a/tools/win_installer/misc/create-launcher.py b/tools/win_installer/misc/create-launcher.py index fd5b8d0a..907c3b49 100644 --- a/tools/win_installer/misc/create-launcher.py +++ b/tools/win_installer/misc/create-launcher.py @@ -13,12 +13,12 @@ """ import os -import sys -import subprocess import shlex -import tempfile import shutil import struct +import subprocess +import sys +import tempfile def build_resource(rc_path, out_path): diff --git a/tools/win_installer/misc/depcheck.py b/tools/win_installer/misc/depcheck.py index ffd13000..b0c4facd 100644 --- a/tools/win_installer/misc/depcheck.py +++ b/tools/win_installer/misc/depcheck.py @@ -12,15 +12,16 @@ Deletes unneeded DLLs and checks DLL dependencies. Execute with the build python, will figure out the rest. """ -import subprocess import os +import subprocess import sys from multiprocessing import Process, Queue import gi -gi.require_version("GIRepository", "2.0") from gi.repository import GIRepository +gi.require_version("GIRepository", "2.0") + def _get_shared_libraries(q, namespace, version): repo = GIRepository.Repository()