sorting imports

with isort -y -rc
see #393

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):

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__)
 

bin/gpodder-migrate2tres

@@ -24,11 +24,14 @@
 # by Thomas Perl <thp@gpodder.org>; 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

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)

share/gpodder/examples/gpodder_mark_played.py

@@ -12,8 +12,8 @@
 #
 # Thomas Perl <thp@gpodder.org>; 2009-09-09
 
-import sys
 import os
+import sys
 
 if len(sys.argv) != 2:
     print("""

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.

share/gpodder/extensions/audio_converter.py

@@ -6,13 +6,13 @@
 # (c) 2011-11-23 Bernd Schlapsi <brot@gmx.info>
 # 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

share/gpodder/extensions/concatenate_videos.py

@@ -3,16 +3,16 @@
 # 2014-05-03 Thomas Perl <thp.io/about>
 # 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

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 <thp.io/about>
 # 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

share/gpodder/extensions/episode_website_context_menu.py

@@ -3,10 +3,11 @@
 # (c) 2014-10-20 Thomas Perl <thp.io/about>
 # 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

share/gpodder/extensions/gtk_statusicon.py

@@ -4,9 +4,14 @@
 # Thomas Perl <thp@gpodder.org>; 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?

share/gpodder/extensions/normalize_audio.py

@@ -7,13 +7,13 @@
 # (c) 2011-11-06 Bernd Schlapsi <brot@gmx.info>
 # 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

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__)
 

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:

share/gpodder/extensions/rename_download.py

@@ -3,13 +3,13 @@
 # Copyright (c) 2011-04-04 Thomas Perl <thp.io>
 # 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

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
 

share/gpodder/extensions/rockbox_convert2mp4.py

@@ -10,15 +10,15 @@
 # Copyright (c) 2011-04-04 Thomas Perl <thp.io>
 # 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

share/gpodder/extensions/rockbox_coverart.py

@@ -3,11 +3,11 @@
 # (c) 2014-04-10 Alex Mayer <magictrick4906@aim.com>
 # 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

share/gpodder/extensions/sonos.py

@@ -4,16 +4,18 @@
 # (c) 2013-01-19 Stefan Kögl <stefan@skoegl.net>
 # 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')

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

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

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')

share/gpodder/extensions/ubuntu_appindicator.py

@@ -3,6 +3,11 @@
 # Ubuntu AppIndicator Icon
 # Thomas Perl <thp@gpodder.org>; 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__)
 

share/gpodder/extensions/ubuntu_unity.py

@@ -3,6 +3,11 @@
 # Ubuntu Unity Launcher Integration
 # Thomas Perl <thp@gpodder.org>; 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__)

share/gpodder/extensions/update_feeds_on_startup.py

@@ -4,9 +4,10 @@
 # (c) 2012-10-13 Bernd Schlapsi <brot@gmx.info>
 # Released under the same license terms as gPodder itself.
 
+import logging
+
 import gpodder
 
-import logging
 logger = logging.getLogger(__name__)
 
 _ = gpodder.gettext

share/gpodder/extensions/video_converter.py

@@ -6,15 +6,13 @@
 # (c) 2011-08-05 Thomas Perl <thp.io/about>
 # 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

src/gpodder/common.py

@@ -21,14 +21,13 @@
 # Thomas Perl <thp@gpodder.org>; 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__)
 
 

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
 

src/gpodder/core.py

@@ -22,12 +22,7 @@
 
 
 import gpodder
-
+from gpodder import config, dbsqlite, extensions, model, util
-from gpodder import util
-from gpodder import config
-from gpodder import dbsqlite
-from gpodder import extensions
-from gpodder import model
 
 
 class Core(object):

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):

src/gpodder/dbsqlite.py

@@ -24,21 +24,22 @@
 # 2010-04-24 Thomas Perl <thp@gpodder.org>
 #
 
-import gpodder
+import logging
-_ = gpodder.gettext
+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):

src/gpodder/dbusproxy.py

@@ -22,13 +22,12 @@
 # Based on a patch by Iwan van der Kleijn <iwanvanderkleyn@gmail.com>
 # 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:

src/gpodder/directory.py

@@ -23,18 +23,18 @@
 # Thomas Perl <thp@gpodder.org>; 2014-10-22
 #
 
-import gpodder
-
-_ = gpodder.gettext
-
 import json
 import os
 import urllib.error
 import urllib.parse
 import urllib.request
 
-from gpodder import opml
+import gpodder
-from gpodder import util
+from gpodder import opml, util
+
+_ = gpodder.gettext
+
+
 
 
 class DirectoryEntry(object):

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__)
+import mimetypes
-
+import os
-from gpodder import util
+import os.path
-from gpodder import youtube
+import shutil
-from gpodder import vimeo
-from gpodder import escapist_videos
-import gpodder
-
 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
 

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

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__)
 
 

src/gpodder/feedcore.py

@@ -22,16 +22,16 @@
 # Thomas Perl <thp@gpodder.org>; 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

src/gpodder/feedservice.py

@@ -17,9 +17,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+import logging
+
 from mygpoclient import feeds
 
-import logging
 logger = logging.getLogger(__name__)
 
 

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

src/gpodder/gtkui/config.py

@@ -23,13 +23,10 @@
 #
 
 
-from gi.repository import Gtk
+from gi.repository import Gdk, Gtk, Pango
-from gi.repository import Gdk
-from gi.repository import Pango
 
 import gpodder
-from gpodder import util
+from gpodder import config, util
-from gpodder import config
 
 _ = gpodder.gettext
 

src/gpodder/gtkui/desktop/channel.py

@@ -17,17 +17,15 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from gi.repository import Gtk
+from gi.repository import Gdk, GdkPixbuf, Gtk
-from gi.repository import Gdk
-from gi.repository import GdkPixbuf
 
 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):

src/gpodder/gtkui/desktop/deviceplaylist.py

@@ -17,15 +17,17 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+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__)
 
 

src/gpodder/gtkui/desktop/episodeselector.py

@@ -17,18 +17,16 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from gi.repository import Gtk
+from gi.repository import Gtk, Pango
-from gi.repository import 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):

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
-
+from gpodder import directory, util
-_ = gpodder.gettext
-
-import logging
-logger = logging.getLogger(__name__)
-
-from gpodder import util
-from gpodder import directory
-
 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))

src/gpodder/gtkui/desktop/preferences.py

@@ -17,29 +17,26 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from gi.repository import Gtk
-from gi.repository import Gdk
-from gi.repository import Pango
 import cgi
+import logging
 import urllib.parse
 
-import logging
+from gi.repository import Gdk, Gtk, Pango
-logger = logging.getLogger(__name__)
 
 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):

src/gpodder/gtkui/desktop/sync.py

@@ -21,17 +21,17 @@
 # Thomas Perl <thp@gpodder.org>; 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__)
 
 

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):

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, GObject, Gtk
-from gi.repository import GdkPixbuf
-from gi.repository import Gtk
 
 import gpodder
 
 _ = gpodder.gettext
 
-import logging
 logger = logging.getLogger(__name__)
 
 # where are the .desktop files located?

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
 
 

src/gpodder/gtkui/draw.py

@@ -23,22 +23,20 @@
 #  Thomas Perl <thp@perli.net>, 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):

src/gpodder/gtkui/interface/addpodcast.py

@@ -17,16 +17,15 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from gi.repository import Gtk
+from gi.repository import Gdk, Gtk
-from gi.repository import Gdk
 
 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):

src/gpodder/gtkui/interface/common.py

@@ -17,19 +17,18 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-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):

src/gpodder/gtkui/interface/configeditor.py

@@ -17,16 +17,17 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-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):

src/gpodder/gtkui/interface/progress.py

@@ -17,15 +17,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from gi.repository import Gtk
+from gi.repository import GObject, Gtk, Pango
-from gi.repository import GObject
-from gi.repository import Pango
 
 import gpodder
+from gpodder.gtkui.widgets import SpinningProgressIndicator
 
 _ = gpodder.gettext
 
-from gpodder.gtkui.widgets import SpinningProgressIndicator
 
 
 class ProgressIndicator(object):

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__ = {

src/gpodder/gtkui/main.py

@@ -17,86 +17,72 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+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 sys
-import time
-import threading
 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):

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

src/gpodder/gtkui/services.py

@@ -23,19 +23,20 @@
 #
 
 
-import gpodder
+import logging
-_ = gpodder.gettext
 
+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):

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 <http://www.gnu.org/licenses/>.
 #
-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, \
+from gpodder.gtkui.draw import (draw_text_box_centered, get_background_color,
-                                get_background_color, get_foreground_color
+                                get_foreground_color)
 
 _ = gpodder.gettext
 

src/gpodder/gtkui/widgets.py

@@ -24,13 +24,10 @@
 #  Thomas Perl <thp@gpodder.org> 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.

src/gpodder/jsonconfig.py

@@ -24,9 +24,8 @@
 #
 
 import copy
-from functools import reduce
-
 import json
+from functools import reduce
 
 
 class JsonConfigSubtree(object):

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__)
 
 

src/gpodder/model.py

@@ -24,29 +24,25 @@
 #  Based on libpodcasts.py (thp, 2005-10-29)
 #
 
-import gpodder
+import collections
-from gpodder import util
+import datetime
-from gpodder import feedcore
+import glob
-from gpodder import youtube
+import hashlib
-from gpodder import vimeo
-from gpodder import escapist_videos
-from gpodder import schema
-from gpodder import coverart
-
 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
 

src/gpodder/my.py

@@ -24,24 +24,25 @@
 #  Thomas Perl <thp@gpodder.org>; 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
+import gpodder
-logger = logging.getLogger(__name__)
-
-from gpodder import util
-from gpodder import minidb
-
 # 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

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):

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):

src/gpodder/schema.py

@@ -20,15 +20,15 @@
 # gpodder.schema - Database schema update and migration facility
 # Thomas Perl <thp@gpodder.org>; 2011-02-01
 
+import logging
+import shutil
+import time
 from sqlite3 import dbapi2 as sqlite
 
-import time
+from gpodder import util
-import shutil
 
-import logging
 logger = logging.getLogger(__name__)
 
-from gpodder import util
 
 EpisodeColumns = (
     'podcast_id',

src/gpodder/services.py

@@ -25,10 +25,10 @@
 #
 
 import gpodder
+from gpodder import util
 
 _ = gpodder.gettext
 
-from gpodder import util
 
 
 class ObservableService(object):

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
+import calendar
-
+import glob
-from gpodder import util
-from gpodder import services
-from gpodder import download
-
 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):

src/gpodder/test/model.py

@@ -24,7 +24,6 @@
 import unittest
 
 import gpodder
-
 from gpodder import model
 
 

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

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 locale
-import gpodder
-
 import logging
-logger = logging.getLogger(__name__)
+import mimetypes
-
 import os
 import os.path
 import platform
-import glob
+import re
-import stat
 import shlex
 import shutil
 import socket
-import sys
+import stat
 import string
-
-import re
 import subprocess
-from html.entities import entitydefs
+import sys
-import time
-import gzip
-import datetime
 import threading
-
+import time
-import http.client
-import webbrowser
-import mimetypes
-import itertools
 import urllib.error
 import urllib.parse
 import urllib.request
-
+import webbrowser
-import io
 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:

src/gpodder/utilwin32ctypes.py

@@ -19,14 +19,14 @@
 #
 
 import ctypes
-from ctypes import c_ulonglong, HRESULT, Structure
+from ctypes import HRESULT, Structure, c_ulonglong
-from ctypes.wintypes import (BOOL, BYTE, DWORD, HANDLE, LPCWSTR, MAX_PATH, PULARGE_INTEGER, WORD)
+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')

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__)
 
 

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)

src/gpodder/youtube.py

@@ -20,14 +20,16 @@
 #  Justin Forest <justin.forest@gmail.com> 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

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
 

tools/progressbar_icon_tester.py

@@ -6,12 +6,15 @@
 #           Thomas Perl <thp.io/about>; 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)

tools/test-auth-server.py

@@ -4,11 +4,11 @@
 # from our crappy-but-does-the-job department
 # Thomas Perl <thp.io/about>; 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

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):

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()