From 29985d4c4b84be7a82a2a7fd3319ce66a49a8202 Mon Sep 17 00:00:00 2001 From: William McBrine Date: Mon, 22 Dec 2008 19:22:06 -0500 Subject: [PATCH] Re-ordered the import lines to fit with PEP 8. --- beacon.py | 1 + config.py | 4 +++- httpserver.py | 16 +++++++++++----- mind.py | 5 +++-- plugin.py | 6 +++++- plugins/admin/admin.py | 20 +++++++++++++++----- plugins/music/music.py | 24 +++++++++++++++++------- plugins/photo/photo.py | 16 ++++++++++++---- plugins/video/transcode.py | 14 ++++++++++++-- plugins/video/video.py | 20 +++++++++++++------- plugins/webvideo/webvideo.py | 37 +++++++++++++++++++++---------------- pyTivo.py | 4 ++-- pyTivoService.py | 11 +++++++---- 13 files changed, 122 insertions(+), 56 deletions(-) diff --git a/beacon.py b/beacon.py index b69bb74..ee6e64a 100644 --- a/beacon.py +++ b/beacon.py @@ -2,6 +2,7 @@ import re import struct from socket import * from threading import Timer + import config class Beacon: diff --git a/config.py b/config.py index 82e044d..064a470 100644 --- a/config.py +++ b/config.py @@ -1,8 +1,10 @@ -import ConfigParser, os, sys +import ConfigParser import logging +import os import re import random import string +import sys from ConfigParser import NoOptionError guid = ''.join([random.choice(string.letters) for i in range(10)]) diff --git a/httpserver.py b/httpserver.py index bd7bfc7..9e8da9b 100644 --- a/httpserver.py +++ b/httpserver.py @@ -1,12 +1,18 @@ -import time, os, BaseHTTPServer, SocketServer, socket, re +import BaseHTTPServer +import SocketServer +import logging +import os +import re +import socket +import time +from cgi import parse_qs from urllib import unquote_plus, quote, unquote from urlparse import urlparse -from cgi import parse_qs +from xml.sax.saxutils import escape + from Cheetah.Template import Template -from plugin import GetPlugin import config -from xml.sax.saxutils import escape -import logging +from plugin import GetPlugin SCRIPTDIR = os.path.dirname(__file__) diff --git a/mind.py b/mind.py index d478ab1..77cfffb 100644 --- a/mind.py +++ b/mind.py @@ -1,10 +1,11 @@ import cookielib +import logging +import time import urllib2 import urllib -import time import warnings + import config -import logging try: import xml.etree.ElementTree as ElementTree diff --git a/plugin.py b/plugin.py index 10d8b14..f5e8694 100644 --- a/plugin.py +++ b/plugin.py @@ -1,4 +1,8 @@ -import os, shutil, random, threading, urllib +import os +import shutil +import random +import threading +import urllib from urlparse import urlparse if os.path.sep == '/': diff --git a/plugins/admin/admin.py b/plugins/admin/admin.py index 493309e..020a21d 100644 --- a/plugins/admin/admin.py +++ b/plugins/admin/admin.py @@ -1,14 +1,24 @@ -import os, socket, re, sys, ConfigParser, config, time -import urllib2, cookielib, thread, buildhelp -from xml.dom import minidom +import ConfigParser +import cookielib +import os +import socket +import re +import sys +import thread +import time +import urllib2 from ConfigParser import NoOptionError -from Cheetah.Template import Template -from plugin import Plugin from urllib import unquote_plus, quote, unquote from urlparse import urlparse +from xml.dom import minidom from xml.sax.saxutils import escape + from lrucache import LRUCache +from Cheetah.Template import Template +import buildhelp +import config import logging +from plugin import Plugin SCRIPTDIR = os.path.dirname(__file__) diff --git a/plugins/music/music.py b/plugins/music/music.py index a2caeab..6e2b378 100644 --- a/plugins/music/music.py +++ b/plugins/music/music.py @@ -1,13 +1,23 @@ -import subprocess, os, random, re, shutil, socket, sys, urllib, time, cgi -import config -from plugins.video.transcode import kill +import cgi +import os +import random +import re +import shutil +import socket +import subprocess +import sys +import time +import urllib +from urlparse import urlparse +from xml.sax.saxutils import escape + +import eyeD3 from Cheetah.Template import Template from Cheetah.Filters import Filter -from plugin import Plugin, quote, unquote -from xml.sax.saxutils import escape from lrucache import LRUCache -from urlparse import urlparse -import eyeD3 +import config +from plugin import Plugin, quote, unquote +from plugins.video.transcode import kill SCRIPTDIR = os.path.dirname(__file__) diff --git a/plugins/photo/photo.py b/plugins/photo/photo.py index 3e5dcab..6fe4bea 100644 --- a/plugins/photo/photo.py +++ b/plugins/photo/photo.py @@ -24,17 +24,25 @@ # Version 0.2, Dec. 8 -- thumbnail caching, faster thumbnails # Version 0.1, Dec. 7, 2007 -import os, re, random, urllib, threading, time, cgi +import cgi +import os +import re +import random +import threading +import time +import urllib +from cStringIO import StringIO +from xml.sax.saxutils import escape + try: import Image except ImportError: print 'Photo Plugin Error: The Python Imaging Library is not installed' -from cStringIO import StringIO + from Cheetah.Template import Template from Cheetah.Filters import Filter -from plugin import Plugin, quote, unquote -from xml.sax.saxutils import escape from lrucache import LRUCache +from plugin import Plugin, quote, unquote SCRIPTDIR = os.path.dirname(__file__) diff --git a/plugins/video/transcode.py b/plugins/video/transcode.py index 92b7e70..c5d749e 100644 --- a/plugins/video/transcode.py +++ b/plugins/video/transcode.py @@ -1,6 +1,16 @@ -import subprocess, shutil, os, re, sys, tempfile, ConfigParser, time, lrucache, math -import config +import ConfigParser import logging +import math +import os +import re +import shutil +import subprocess +import sys +import tempfile +import time + +import lrucache +import config from plugin import GetPlugin logger = logging.getLogger('pyTivo.video.transcode') diff --git a/plugins/video/video.py b/plugins/video/video.py index 4f807bd..6727622 100644 --- a/plugins/video/video.py +++ b/plugins/video/video.py @@ -1,15 +1,21 @@ -import transcode, os, socket, re, urllib, zlib -from Cheetah.Template import Template -from plugin import Plugin, quote, unquote +import logging +import os +import re +import socket +import time +import urllib +import zlib +from UserDict import DictMixin +from datetime import datetime, timedelta from urlparse import urlparse from xml.sax.saxutils import escape + +from Cheetah.Template import Template from lrucache import LRUCache -from UserDict import DictMixin -from datetime import datetime, timedelta import config -import time import mind -import logging +import transcode +from plugin import Plugin, quote, unquote SCRIPTDIR = os.path.dirname(__file__) diff --git a/plugins/webvideo/webvideo.py b/plugins/webvideo/webvideo.py index 89b8c8f..501aa50 100644 --- a/plugins/webvideo/webvideo.py +++ b/plugins/webvideo/webvideo.py @@ -1,24 +1,29 @@ -from plugins.video.video import Video, VideoDetails -import mind -import config - -import xmpp - -import threading -import urllib2 -import os.path +import Queue +import logging +import os import shutil -import os.path +import threading import time -import os -import urlparse import urllib -import xml.etree.ElementTree as ElementTree -import Queue -import logging +import urllib2 +import urlparse +import warnings -CLASS_NAME = 'WebVideo' +try: + import xml.etree.ElementTree as ElementTree +except ImportError: + try: + import elementtree.ElementTree as ElementTree + except ImportError: + warnings.warn('Python 2.5 or higher or elementtree is ' + + 'needed to use the TivoPush') +import xmpp +import mind +import config +from plugins.video.video import Video, VideoDetails + +CLASS_NAME = 'WebVideo' class WebVideo(Video): diff --git a/pyTivo.py b/pyTivo.py index bdf6267..d09ad61 100755 --- a/pyTivo.py +++ b/pyTivo.py @@ -1,9 +1,9 @@ #!/usr/bin/env python -import beacon -import httpserver import os +import beacon +import httpserver import config from plugin import GetPlugin diff --git a/pyTivoService.py b/pyTivoService.py index 4c2cbc4..78a94c9 100644 --- a/pyTivoService.py +++ b/pyTivoService.py @@ -1,9 +1,12 @@ -import beacon, httpserver -import win32serviceutil -import win32service +import select +import sys import win32event -import select, sys +import win32service +import win32serviceutil + +import beacon import config +import httpserver class PyTivoService(win32serviceutil.ServiceFramework): _svc_name_ = 'pyTivo' -- 2.11.4.GIT