mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-06 07:20:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'py3' into 'master'

Browse source 
Python 3

I tried to keep commits separate, so if anything causes trouble, it can be reverted or changed easily.

* pre-commit hooks pass
* all tests pass
* My use of `build`, `checkupdates`, `lint`, `import`, `publish` and `update` work as usual
* 2to3 does not report anything useful anymore (only useless parentheses and list() encapsulation of iterators)
* rewritemeta works exactly as usual

CC @eighthave

See merge request !88
This commit is contained in:
Daniel Martí 2016-03-11 23:51:56 +00:00
commit f267a1d7c9
38 changed files with 339 additions and 383 deletions
Download patch file Download diff file Expand all files Collapse all files

34
fdroidserver/checkupdates.py
View file

@ -1,5 +1,4 @@
#!/usr/bin/env python2
# -*- coding: utf-8 -*-
#!/usr/bin/env python3
#
# checkupdates.py - part of the FDroid server tools
# Copyright (C) 2010-2015, Ciaran Gultnieks, ciaran@ciarang.com
@ -21,20 +20,21 @@
import sys
import os
import re
import urllib2
import urllib.request
import urllib.error
import time
import subprocess
from argparse import ArgumentParser
import traceback
import HTMLParser
from html.parser import HTMLParser
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.
@ -52,8 +52,8 @@ def check_http(app):
vercode = "99999999"
if len(urlcode) > 0:
logging.debug("...requesting {0}".format(urlcode))
req = urllib2.Request(urlcode, None)
resp = urllib2.urlopen(req, None, 20)
req = urllib.request.Request(urlcode, None)
resp = urllib.request.urlopen(req, None, 20)
page = resp.read()
m = re.search(codeex, page)
@ -65,8 +65,8 @@ def check_http(app):
if len(urlver) > 0:
if urlver != '.':
logging.debug("...requesting {0}".format(urlver))
req = urllib2.Request(urlver, None)
resp = urllib2.urlopen(req, None, 20)
req = urllib.request.Request(urlver, None)
resp = urllib.request.urlopen(req, None, 20)
page = resp.read()
m = re.search(verex, page)
@ -280,11 +280,11 @@ def check_gplay(app):
time.sleep(15)
url = 'https://play.google.com/store/apps/details?id=' + app.id
headers = {'User-Agent': 'Mozilla/5.0 (X11; Linux i686; rv:18.0) Gecko/20100101 Firefox/18.0'}
req = urllib2.Request(url, None, headers)
req = urllib.request.Request(url, None, headers)
try:
resp = urllib2.urlopen(req, None, 20)
resp = urllib.request.urlopen(req, None, 20)
page = resp.read()
except urllib2.HTTPError as e:
except urllib.error.HTTPError as e:
return (None, str(e.code))
except Exception as e:
return (None, 'Failed:' + str(e))
@ -293,7 +293,7 @@ def check_gplay(app):
m = re.search('itemprop="softwareVersion">[ ]*([^<]+)[ ]*</div>', page)
if m:
html_parser = HTMLParser.HTMLParser()
html_parser = HTMLParser()
version = html_parser.unescape(m.group(1))
if version == 'Varies with device':
@ -559,7 +559,7 @@ def main():
.format(common.getappname(app), version))
return
for appid, app in apps.iteritems():
for appid, app in apps.items():
if options.autoonly and app.AutoUpdateMode in ('None', 'Static'):
logging.debug("Nothing to do for {0}...".format(appid))