Port all imports to python3

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index b088d5260775bbbe8a179ac0b8b15e8e4b804f90..60442554798b733ffa3bc605add1c7e198d32298 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -31,11 +31,11 @@ from ConfigParser import ConfigParser
 from argparse import ArgumentParser
 import logging
 
-import common
-import net
-import metadata
-import scanner
-from common import FDroidException, BuildException, VCSException, FDroidPopen, SdkToolsPopen
+from . import common
+from . import net
+from . import metadata
+from . import scanner
+from .common import FDroidException, BuildException, VCSException, FDroidPopen, SdkToolsPopen
 
 try:
     import paramiko

diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index a285259de32409cd3b7c7777f01efcfaac975849..8ca14edc8870dda4dccac239966974561fa896ad 100644 (file)
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -30,10 +30,10 @@ from distutils.version import LooseVersion
 import logging
 import copy
 
-import common
-import metadata
-from common import VCSException, FDroidException
-from metadata import MetaDataException
+from . import common
+from . import metadata
+from .common import VCSException, FDroidException
+from .metadata import MetaDataException
 
 
 # Check for a new version by looking at a document retrieved via HTTP.

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 623d1ab28c02e5e71b9b4e6a8c14b84a46517c81..327741801e797eaeddfa6c250ae248b5d8e638d2 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -40,7 +40,7 @@ from queue import Queue
 from zipfile import ZipFile
 
 import fdroidserver.metadata
-from fdroidserver.asynchronousfilereader import AsynchronousFileReader
+from .asynchronousfilereader import AsynchronousFileReader
 
 
 XMLElementTree.register_namespace('android', 'http://schemas.android.com/apk/res/android')

diff --git a/fdroidserver/gpgsign.py b/fdroidserver/gpgsign.py
index f27b9651c15d019eec7e1aad614df2197fb7c8c5..41b5a43f831f314b109ee4031cfd2482ea318432 100644 (file)
--- a/fdroidserver/gpgsign.py
+++ b/fdroidserver/gpgsign.py
@@ -22,8 +22,8 @@ import glob
 from argparse import ArgumentParser
 import logging
 
-import common
-from common import FDroidPopen
+from . import common
+from .common import FDroidPopen
 
 config = None
 options = None

diff --git a/fdroidserver/import.py b/fdroidserver/import.py
index 5cead3f23b231097f68c23e539a4e58bc9eefde5..a81bd55e6206cf218d7ec9fc3b3be56ac1b1d3eb 100644 (file)
--- a/fdroidserver/import.py
+++ b/fdroidserver/import.py
@@ -24,8 +24,9 @@ import urllib
 from argparse import ArgumentParser
 from ConfigParser import ConfigParser
 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

diff --git a/fdroidserver/init.py b/fdroidserver/init.py
index 4bed02c14f6ac2e04b8b9ae1d2c058ec3bad9bef..590307d9e8606a3a96edc8ebc1cc9e614ae337f1 100644 (file)
--- a/fdroidserver/init.py
+++ b/fdroidserver/init.py
@@ -27,7 +27,7 @@ import sys
 from argparse import ArgumentParser
 import logging
 
-import common
+from . import common
 
 config = {}
 options = None

diff --git a/fdroidserver/install.py b/fdroidserver/install.py
index 6921530159c15c65e0e93ecc927fe7eaacb80e09..350003ac7e8cc9b9e0f77785446a91c46b4bb190 100644 (file)
--- a/fdroidserver/install.py
+++ b/fdroidserver/install.py
@@ -23,8 +23,8 @@ import glob
 from argparse import ArgumentParser
 import logging
 
-import common
-from common import SdkToolsPopen, FDroidException
+from . import common
+from .common import SdkToolsPopen, FDroidException
 
 options = None
 config = None

diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py
index 1bcb09ff40ff5b41cc969f27fe3ddd099e765bd6..e2e889417837a1e344af19165a29a210421081a2 100644 (file)
--- a/fdroidserver/lint.py
+++ b/fdroidserver/lint.py
@@ -21,9 +21,9 @@ import re
 import sys
 from sets import Set
 
-import common
-import metadata
-import rewritemeta
+from . import common
+from . import metadata
+from . import rewritemeta
 
 config = None
 options = None

diff --git a/fdroidserver/publish.py b/fdroidserver/publish.py
index c34382342f806e9e5a30edc4b01753e53dc171c0..7dda4e8b2e5e76a55b404b407cfe9f5f673d351a 100644 (file)
--- a/fdroidserver/publish.py
+++ b/fdroidserver/publish.py
@@ -25,9 +25,9 @@ import glob
 from argparse import ArgumentParser
 import logging
 
-import common
-import metadata
-from common import FDroidPopen, SdkToolsPopen, BuildException
+from . import common
+from . import metadata
+from .common import FDroidPopen, SdkToolsPopen, BuildException
 
 config = None
 options = None

diff --git a/fdroidserver/readmeta.py b/fdroidserver/readmeta.py
index 16f187f23d053a3504f026b9414a2d92cc372e76..e04b5623c7c51cb279a0ceca0f4741984012032e 100644 (file)
--- a/fdroidserver/readmeta.py
+++ b/fdroidserver/readmeta.py
@@ -17,8 +17,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from argparse import ArgumentParser
-from fdroidserver import common
-from fdroidserver import metadata
+from . import common
+from . import metadata
 
 
 def main():

diff --git a/fdroidserver/rewritemeta.py b/fdroidserver/rewritemeta.py
index dc2cca6aaa5df4cd20b37168059131e68930f4fb..971ab18cb597d5899dc2a646bf850e4004f974c0 100644 (file)
--- a/fdroidserver/rewritemeta.py
+++ b/fdroidserver/rewritemeta.py
@@ -22,8 +22,8 @@ import os
 import logging
 import io
 
-from fdroidserver import common
-from fdroidserver import metadata
+from . import common
+from . import metadata
 
 config = None
 options = None

diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py
index 76eb73eac66f9e23b328fa6cd3e5f37973525dc1..d8f568c4391ffae81c6eaef006a5038a57fe9953 100644 (file)
--- a/fdroidserver/scanner.py
+++ b/fdroidserver/scanner.py
@@ -22,9 +22,9 @@ import traceback
 from argparse import ArgumentParser
 import logging
 
-import common
-import metadata
-from common import BuildException, VCSException
+from . import common
+from . import metadata
+from .common import BuildException, VCSException
 
 config = None
 options = None

diff --git a/fdroidserver/server.py b/fdroidserver/server.py
index dfa3a1a6819abd8a6569fc95a035f631339de95d..ed39f0a7c48cb728b8bc78efcb73831958717aa6 100644 (file)
--- a/fdroidserver/server.py
+++ b/fdroidserver/server.py
@@ -25,7 +25,8 @@ import pwd
 import subprocess
 from argparse import ArgumentParser
 import logging
-import common
+
+from . import common
 
 config = None
 options = None

diff --git a/fdroidserver/signindex.py b/fdroidserver/signindex.py
index 7ae9fb7b126da80ba00053edb9a3628e04a3418b..c550b995478563f239f06bf1aa373e711ccc0c32 100644 (file)
--- a/fdroidserver/signindex.py
+++ b/fdroidserver/signindex.py
@@ -21,8 +21,8 @@ import os
 from argparse import ArgumentParser
 import logging
 
-import common
-from common import FDroidPopen
+from . import common
+from .common import FDroidPopen
 
 config = None
 options = None

diff --git a/fdroidserver/stats.py b/fdroidserver/stats.py
index 351390fbf77bbc4dca6fc8854d655efd825829f1..cd1e7a671c1a588e343e98a5a4989cb83de6b39d 100644 (file)
--- a/fdroidserver/stats.py
+++ b/fdroidserver/stats.py
@@ -27,11 +27,12 @@ from argparse import ArgumentParser
 import paramiko
 import socket
 import logging
-import common
-import metadata
 import subprocess
 from collections import Counter
 
+from . import common
+from . import metadata
+
 
 def carbon_send(key, value):
     s = socket.socket()

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index b171d4230703ee23de3664846e607e652c6af0c5..a67477e9050c911acb28d70f277e9c3e29367421 100644 (file)
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -40,10 +40,10 @@ from binascii import hexlify, unhexlify
 from PIL import Image
 import logging
 
-import common
-import metadata
-from common import FDroidPopen, SdkToolsPopen
-from metadata import MetaDataException
+from . import common
+from . import metadata
+from .common import FDroidPopen, SdkToolsPopen
+from .metadata import MetaDataException
 
 screen_densities = ['640', '480', '320', '240', '160', '120']
 

diff --git a/fdroidserver/verify.py b/fdroidserver/verify.py
index 6ffff876bf5336536904fc7f8fe2d4d5751e0947..82a690c4eb05f8a5084769c7587357b1d6d53682 100644 (file)
--- a/fdroidserver/verify.py
+++ b/fdroidserver/verify.py
@@ -22,9 +22,9 @@ import glob
 from argparse import ArgumentParser
 import logging
 
-import common
-import net
-from common import FDroidException
+from . import common
+from . import net
+from .common import FDroidException
 
 options = None
 config = None