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