Skip to content

Commit

Permalink
format
Browse files Browse the repository at this point in the history
  • Loading branch information
Jintin committed Jul 25, 2017
1 parent 9b9f2b3 commit b767426
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 45 deletions.
6 changes: 3 additions & 3 deletions andle/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@


def update(path, dryrun, remote, gradle, interact):
data = sdk.load()
android.update(path, data, dryrun, remote, gradle, interact)
data = sdk.load()
android.update(path, data, dryrun, remote, gradle, interact)


def setsdk(path):
sdk.setpath(path)
sdk.setpath(path)
14 changes: 7 additions & 7 deletions andle/gradle.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@


def load(url=URL):
try:
reader = codecs.getreader("utf-8")
data = json.load(reader(andle.http.request(url)))
return data["version"]
except Exception:
print("fail to connect url: " + url)
return None
try:
reader = codecs.getreader("utf-8")
data = json.load(reader(andle.http.request(url)))
return data["version"]
except Exception:
print("fail to connect url: " + url)
return None
12 changes: 6 additions & 6 deletions andle/http.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/usr/bin/python

try:
from urllib.request import urlopen
from urllib.request import urlopen
except ImportError:
from urllib2 import urlopen
from urllib2 import urlopen


def request(url):
try:
return urlopen(url)
except Exception:
return None
try:
return urlopen(url)
except Exception:
return None
23 changes: 12 additions & 11 deletions andle/remote.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,16 @@


def load(name, url=JCENTER_URL):
request = andle.http.request(url + name.replace(".", "/").replace(":", "/") + "/maven-metadata.xml")
try:
DOMTree = minidom.parse(request)
request = andle.http.request(
url + name.replace(".", "/").replace(":", "/") + "/maven-metadata.xml")
try:
DOMTree = minidom.parse(request)

collection = DOMTree.documentElement
versioning = collection.getElementsByTagName("versioning")[0]
latest = versioning.getElementsByTagName("release")[0]
version = latest.childNodes[0].data
return version
except BaseException:
print("fail to get version : " + name)
return None
collection = DOMTree.documentElement
versioning = collection.getElementsByTagName("versioning")[0]
latest = versioning.getElementsByTagName("release")[0]
version = latest.childNodes[0].data
return version
except BaseException:
print("fail to get version : " + name)
return None
39 changes: 21 additions & 18 deletions andle/version.py
Original file line number Diff line number Diff line change
@@ -1,26 +1,29 @@
#!/usr/bin/env python


def newer(version1, version2):

parts1 = [x for x in version1.split('.')]
parts2 = [x for x in version2.split('.')]
parts1 = [x for x in version1.split('.')]
parts2 = [x for x in version2.split('.')]

# fill up the shorter version with zeros ...
lendiff = len(parts1) - len(parts2)
if lendiff > 0:
parts2.extend([0] * lendiff)
elif lendiff < 0:
parts1.extend([0] * (-lendiff))

# fill up the shorter version with zeros ...
lendiff = len(parts1) - len(parts2)
if lendiff > 0:
parts2.extend([0] * lendiff)
elif lendiff < 0:
parts1.extend([0] * (-lendiff))
return cmp(parts1, parts2)

return cmp(parts1, parts2)

def cmp(parts1, parts2):
for i, p in enumerate(parts1):
p = str(p)
s = str(parts2[i])
if p.isdigit() and s.isdigit():
p = int(p)
s = int(s)
ret = (p < s) - (p > s)
if ret: return ret
return 0
for i, p in enumerate(parts1):
p = str(p)
s = str(parts2[i])
if p.isdigit() and s.isdigit():
p = int(p)
s = int(s)
ret = (p < s) - (p > s)
if ret:
return ret
return 0

0 comments on commit b767426

Please sign in to comment.