mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-15 15:32:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix imports in Python 3

Browse source 
Since common and metadata import each other, we must import via
"fdroidserver.*".
This commit is contained in:
Daniel Martí 2016-01-04 16:57:57 +01:00
parent 99edd64372
commit e3591cb7b8
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
fdroidserver/common.py
View file

@ -43,7 +43,7 @@ except ImportError:
from zipfile import ZipFile from zipfile import ZipFile
import metadata import fdroidserver.metadata
from fdroidserver.asynchronousfilereader import AsynchronousFileReader from fdroidserver.asynchronousfilereader import AsynchronousFileReader
@ -486,9 +486,9 @@ def getvcs(vcstype, remote, local):
def getsrclibvcs(name): def getsrclibvcs(name):
if name not in metadata.srclibs: if name not in fdroidserver.metadata.srclibs:
raise VCSException("Missing srclib " + name) raise VCSException("Missing srclib " + name)
return metadata.srclibs[name]['Repo Type'] return fdroidserver.metadata.srclibs[name]['Repo Type']
class vcs: class vcs:
@ -1215,10 +1215,10 @@ def getsrclib(spec, srclib_dir, subdir=None, basepath=False,
if '/' in name: if '/' in name:
name, subdir = name.split('/', 1) name, subdir = name.split('/', 1)
if name not in metadata.srclibs: if name not in fdroidserver.metadata.srclibs:
raise VCSException('srclib ' + name + ' not found.') raise VCSException('srclib ' + name + ' not found.')
srclib = metadata.srclibs[name] srclib = fdroidserver.metadata.srclibs[name]
sdir = os.path.join(srclib_dir, name) sdir = os.path.join(srclib_dir, name)

12
fdroidserver/metadata.py
View file

@ -41,7 +41,7 @@ except ImportError:
# use the C implementation when available # use the C implementation when available
import xml.etree.cElementTree as ElementTree import xml.etree.cElementTree as ElementTree
import common import fdroidserver.common
srclibs = None srclibs = None
@ -352,7 +352,7 @@ class Build():
version = self.ndk version = self.ndk
if not version: if not version:
version = 'r10e' # falls back to latest version = 'r10e' # falls back to latest
paths = common.config['ndk_paths'] paths = fdroidserver.common.config['ndk_paths']
if version not in paths: if version not in paths:
return '' return ''
return paths[version] return paths[version]
@ -826,7 +826,7 @@ def get_default_app_info(metadatapath=None):
if metadatapath is None: if metadatapath is None:
appid = None appid = None
else: else:
appid, _ = common.get_extension(os.path.basename(metadatapath)) appid, _ = fdroidserver.common.get_extension(os.path.basename(metadatapath))
app = App() app = App()
app.metadatapath = metadatapath app.metadatapath = metadatapath
@ -947,15 +947,15 @@ def _decode_bool(s):
def parse_metadata(metadatapath): def parse_metadata(metadatapath):
_, ext = common.get_extension(metadatapath) _, ext = fdroidserver.common.get_extension(metadatapath)
accepted = common.config['accepted_formats'] accepted = fdroidserver.common.config['accepted_formats']
if ext not in accepted: if ext not in accepted:
raise MetaDataException('"%s" is not an accepted format, convert to: %s' % ( raise MetaDataException('"%s" is not an accepted format, convert to: %s' % (
metadatapath, ', '.join(accepted))) metadatapath, ', '.join(accepted)))
app = App() app = App()
app.metadatapath = metadatapath app.metadatapath = metadatapath
app.id, _ = common.get_extension(os.path.basename(metadatapath)) app.id, _ = fdroidserver.common.get_extension(os.path.basename(metadatapath))
with open(metadatapath, 'r') as mf: with open(metadatapath, 'r') as mf:
if ext == 'txt': if ext == 'txt':