Reorder import statements as per pep 8

1.2
IceArmy 2011-06-03 21:15:59 -07:00
parent a9bf0b964a
commit fba248781a
5 changed files with 15 additions and 11 deletions

View File

@ -19,17 +19,17 @@
import sys
from PyQt4.QtCore import pyqtProperty, pyqtSlot, QObject, \
QFile, qCritical
from PyQt4.QtGui import QApplication
from PyQt4.QtNetwork import QNetworkProxy, QNetworkProxyFactory
from utils import version_major, version_minor, version_patch
from plugincontroller import Bunch, do_action
from csconverter import CSConverter
from webpage import WebPage
from networkaccessmanager import NetworkAccessManager
from PyQt4.QtCore import pyqtProperty, pyqtSlot, QObject, \
QFile, qCritical
from PyQt4.QtGui import QApplication
from PyQt4.QtNetwork import QNetworkProxy, QNetworkProxyFactory
class Phantom(QObject):
def __init__(self, args, parent=None):

View File

@ -21,6 +21,7 @@ from glob import glob
from collections import defaultdict
from os.path import dirname, split, splitext
plugins = defaultdict(list)
hook_count = {}

View File

@ -23,21 +23,23 @@ import sip
sip.setapi('QString', 2)
sip.setapi('QVariant', 2)
import os, sys, resources
import os
import sys
import codecs
from PyQt4.QtCore import qInstallMsgHandler
from PyQt4.QtGui import QIcon, QApplication
from plugincontroller import Bunch, do_action
# load plugins if running script directly
if __name__ == '__main__':
from plugincontroller import load_plugins
load_plugins()
import resources
from phantom import Phantom
from utils import argParser, MessageHandler, version
from PyQt4.QtCore import qInstallMsgHandler
from PyQt4.QtGui import QIcon, QApplication
# make keyboard interrupt quit program
import signal
signal.signal(signal.SIGINT, signal.SIG_DFL)

View File

@ -19,12 +19,12 @@
import sys
import argparse
from unicodedata import normalize
from PyQt4.QtCore import QDateTime, Qt, QtDebugMsg, QtWarningMsg, QtCriticalMsg, QtFatalMsg
from plugincontroller import Bunch, do_action
from PyQt4.QtCore import QDateTime, Qt, QtDebugMsg, QtWarningMsg, QtCriticalMsg, QtFatalMsg
version_major, version_minor, version_patch = (1, 2, 0)
version = '%d.%d.%d' % (version_major, version_minor, version_patch)

View File

@ -29,6 +29,7 @@ from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest
from plugincontroller import Bunch, do_action
# Different defaults.
# OSX: 72, X11: 75(?), Windows: 96
pdf_dpi = 72