From 2f2618e06c9139d9cb3282b83c2f5091ab7593ea Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 1 May 2014 22:36:12 -0400 Subject: [PATCH] fix PEP8 "E401 multiple imports on one line" --- fdroidserver/checkupdates.py | 3 ++- fdroidserver/common.py | 4 +++- fdroidserver/import.py | 3 ++- fdroidserver/lint.py | 3 ++- fdroidserver/metadata.py | 4 +++- fdroidserver/publish.py | 3 ++- fdroidserver/readmeta.py | 3 ++- fdroidserver/rewritemeta.py | 3 ++- fdroidserver/scanner.py | 3 ++- fdroidserver/update.py | 3 ++- 10 files changed, 22 insertions(+), 10 deletions(-) diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py index 7edfc2c2..29490fe7 100644 --- a/fdroidserver/checkupdates.py +++ b/fdroidserver/checkupdates.py @@ -30,7 +30,8 @@ import HTMLParser from distutils.version import LooseVersion import logging -import common, metadata +import common +import metadata from common import BuildException from common import VCSException from metadata import MetaDataException diff --git a/fdroidserver/common.py b/fdroidserver/common.py index f4709dd1..ef0619a5 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -17,7 +17,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -import os, sys, re +import os +import sys +import re import shutil import glob import stat diff --git a/fdroidserver/import.py b/fdroidserver/import.py index 12c5beb8..0ec73e8f 100644 --- a/fdroidserver/import.py +++ b/fdroidserver/import.py @@ -25,7 +25,8 @@ import urllib from optparse import OptionParser from ConfigParser import ConfigParser import logging -import common, metadata +import common +import metadata # Get the repo type and address from the given web page. The page is scanned # in a rather naive manner for 'git clone xxxx', 'hg clone xxxx', etc, and diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py index 1abb0393..67c20b77 100644 --- a/fdroidserver/lint.py +++ b/fdroidserver/lint.py @@ -20,7 +20,8 @@ from optparse import OptionParser import re import logging -import common, metadata +import common +import metadata config = None options = None diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index d8022582..55dcf519 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -17,7 +17,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -import os, re, glob +import os +import re +import glob import cgi import logging diff --git a/fdroidserver/publish.py b/fdroidserver/publish.py index 878a5bf6..b9776eb0 100644 --- a/fdroidserver/publish.py +++ b/fdroidserver/publish.py @@ -26,7 +26,8 @@ import glob from optparse import OptionParser import logging -import common, metadata +import common +import metadata from common import FDroidPopen, BuildException config = None diff --git a/fdroidserver/readmeta.py b/fdroidserver/readmeta.py index e9665130..9145068b 100644 --- a/fdroidserver/readmeta.py +++ b/fdroidserver/readmeta.py @@ -17,7 +17,8 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -import os, metadata +import os +import metadata def main(): diff --git a/fdroidserver/rewritemeta.py b/fdroidserver/rewritemeta.py index 74c185b1..845f0f81 100644 --- a/fdroidserver/rewritemeta.py +++ b/fdroidserver/rewritemeta.py @@ -20,7 +20,8 @@ import os from optparse import OptionParser import logging -import common, metadata +import common +import metadata config = None options = None diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py index 34293ebb..e54d7011 100644 --- a/fdroidserver/scanner.py +++ b/fdroidserver/scanner.py @@ -22,7 +22,8 @@ import traceback from optparse import OptionParser import logging -import common, metadata +import common +import metadata from common import BuildException from common import VCSException diff --git a/fdroidserver/update.py b/fdroidserver/update.py index 461982d5..ab540f9d 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -32,7 +32,8 @@ import time from PIL import Image import logging -import common, metadata +import common +import metadata from common import FDroidPopen from metadata import MetaDataException