mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-11-14 19:10:11 +01:00
Port all imports to python3
This commit is contained in:
parent
11b8b1ca4f
commit
920ae4692f
@ -31,11 +31,11 @@ from ConfigParser import ConfigParser
|
|||||||
from argparse import ArgumentParser
|
from argparse import ArgumentParser
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
import common
|
from . import common
|
||||||
import net
|
from . import net
|
||||||
import metadata
|
from . import metadata
|
||||||
import scanner
|
from . import scanner
|
||||||
from common import FDroidException, BuildException, VCSException, FDroidPopen, SdkToolsPopen
|
from .common import FDroidException, BuildException, VCSException, FDroidPopen, SdkToolsPopen
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import paramiko
|
import paramiko
|
||||||
|
@ -30,10 +30,10 @@ from distutils.version import LooseVersion
|
|||||||
import logging
|
import logging
|
||||||
import copy
|
import copy
|
||||||
|
|
||||||
import common
|
from . import common
|
||||||
import metadata
|
from . import metadata
|
||||||
from common import VCSException, FDroidException
|
from .common import VCSException, FDroidException
|
||||||
from metadata import MetaDataException
|
from .metadata import MetaDataException
|
||||||
|
|
||||||
|
|
||||||
# Check for a new version by looking at a document retrieved via HTTP.
|
# Check for a new version by looking at a document retrieved via HTTP.
|
||||||
|
@ -40,7 +40,7 @@ from queue import Queue
|
|||||||
from zipfile import ZipFile
|
from zipfile import ZipFile
|
||||||
|
|
||||||
import fdroidserver.metadata
|
import fdroidserver.metadata
|
||||||
from fdroidserver.asynchronousfilereader import AsynchronousFileReader
|
from .asynchronousfilereader import AsynchronousFileReader
|
||||||
|
|
||||||
|
|
||||||
XMLElementTree.register_namespace('android', 'http://schemas.android.com/apk/res/android')
|
XMLElementTree.register_namespace('android', 'http://schemas.android.com/apk/res/android')
|
||||||
|
@ -22,8 +22,8 @@ import glob
|
|||||||
from argparse import ArgumentParser
|
from argparse import ArgumentParser
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
import common
|
from . import common
|
||||||
from common import FDroidPopen
|
from .common import FDroidPopen
|
||||||
|
|
||||||
config = None
|
config = None
|
||||||
options = None
|
options = None
|
||||||
|
@ -24,8 +24,9 @@ import urllib
|
|||||||
from argparse import ArgumentParser
|
from argparse import ArgumentParser
|
||||||
from ConfigParser import ConfigParser
|
from ConfigParser import ConfigParser
|
||||||
import logging
|
import logging
|
||||||
import common
|
|
||||||
import metadata
|
from . import common
|
||||||
|
from . import metadata
|
||||||
|
|
||||||
|
|
||||||
# Get the repo type and address from the given web page. The page is scanned
|
# Get the repo type and address from the given web page. The page is scanned
|
||||||
|
@ -27,7 +27,7 @@ import sys
|
|||||||
from argparse import ArgumentParser
|
from argparse import ArgumentParser
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
import common
|
from . import common
|
||||||
|
|
||||||
config = {}
|
config = {}
|
||||||
options = None
|
options = None
|
||||||
|
@ -23,8 +23,8 @@ import glob
|
|||||||
from argparse import ArgumentParser
|
from argparse import ArgumentParser
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
import common
|
from . import common
|
||||||
from common import SdkToolsPopen, FDroidException
|
from .common import SdkToolsPopen, FDroidException
|
||||||
|
|
||||||
options = None
|
options = None
|
||||||
config = None
|
config = None
|
||||||
|
@ -21,9 +21,9 @@ import re
|
|||||||
import sys
|
import sys
|
||||||
from sets import Set
|
from sets import Set
|
||||||
|
|
||||||
import common
|
from . import common
|
||||||
import metadata
|
from . import metadata
|
||||||
import rewritemeta
|
from . import rewritemeta
|
||||||
|
|
||||||
config = None
|
config = None
|
||||||
options = None
|
options = None
|
||||||
|
@ -25,9 +25,9 @@ import glob
|
|||||||
from argparse import ArgumentParser
|
from argparse import ArgumentParser
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
import common
|
from . import common
|
||||||
import metadata
|
from . import metadata
|
||||||
from common import FDroidPopen, SdkToolsPopen, BuildException
|
from .common import FDroidPopen, SdkToolsPopen, BuildException
|
||||||
|
|
||||||
config = None
|
config = None
|
||||||
options = None
|
options = None
|
||||||
|
@ -17,8 +17,8 @@
|
|||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
from argparse import ArgumentParser
|
from argparse import ArgumentParser
|
||||||
from fdroidserver import common
|
from . import common
|
||||||
from fdroidserver import metadata
|
from . import metadata
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
|
@ -22,8 +22,8 @@ import os
|
|||||||
import logging
|
import logging
|
||||||
import io
|
import io
|
||||||
|
|
||||||
from fdroidserver import common
|
from . import common
|
||||||
from fdroidserver import metadata
|
from . import metadata
|
||||||
|
|
||||||
config = None
|
config = None
|
||||||
options = None
|
options = None
|
||||||
|
@ -22,9 +22,9 @@ import traceback
|
|||||||
from argparse import ArgumentParser
|
from argparse import ArgumentParser
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
import common
|
from . import common
|
||||||
import metadata
|
from . import metadata
|
||||||
from common import BuildException, VCSException
|
from .common import BuildException, VCSException
|
||||||
|
|
||||||
config = None
|
config = None
|
||||||
options = None
|
options = None
|
||||||
|
@ -25,7 +25,8 @@ import pwd
|
|||||||
import subprocess
|
import subprocess
|
||||||
from argparse import ArgumentParser
|
from argparse import ArgumentParser
|
||||||
import logging
|
import logging
|
||||||
import common
|
|
||||||
|
from . import common
|
||||||
|
|
||||||
config = None
|
config = None
|
||||||
options = None
|
options = None
|
||||||
|
@ -21,8 +21,8 @@ import os
|
|||||||
from argparse import ArgumentParser
|
from argparse import ArgumentParser
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
import common
|
from . import common
|
||||||
from common import FDroidPopen
|
from .common import FDroidPopen
|
||||||
|
|
||||||
config = None
|
config = None
|
||||||
options = None
|
options = None
|
||||||
|
@ -27,11 +27,12 @@ from argparse import ArgumentParser
|
|||||||
import paramiko
|
import paramiko
|
||||||
import socket
|
import socket
|
||||||
import logging
|
import logging
|
||||||
import common
|
|
||||||
import metadata
|
|
||||||
import subprocess
|
import subprocess
|
||||||
from collections import Counter
|
from collections import Counter
|
||||||
|
|
||||||
|
from . import common
|
||||||
|
from . import metadata
|
||||||
|
|
||||||
|
|
||||||
def carbon_send(key, value):
|
def carbon_send(key, value):
|
||||||
s = socket.socket()
|
s = socket.socket()
|
||||||
|
@ -40,10 +40,10 @@ from binascii import hexlify, unhexlify
|
|||||||
from PIL import Image
|
from PIL import Image
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
import common
|
from . import common
|
||||||
import metadata
|
from . import metadata
|
||||||
from common import FDroidPopen, SdkToolsPopen
|
from .common import FDroidPopen, SdkToolsPopen
|
||||||
from metadata import MetaDataException
|
from .metadata import MetaDataException
|
||||||
|
|
||||||
screen_densities = ['640', '480', '320', '240', '160', '120']
|
screen_densities = ['640', '480', '320', '240', '160', '120']
|
||||||
|
|
||||||
|
@ -22,9 +22,9 @@ import glob
|
|||||||
from argparse import ArgumentParser
|
from argparse import ArgumentParser
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
import common
|
from . import common
|
||||||
import net
|
from . import net
|
||||||
from common import FDroidException
|
from .common import FDroidException
|
||||||
|
|
||||||
options = None
|
options = None
|
||||||
config = None
|
config = None
|
||||||
|
Loading…
Reference in New Issue
Block a user