0x2620/python-ox
2
1
Fork 0
Code Issues Pull requests Releases Wiki Activity

string.letters is changes uppercase position between python version, use string.ascii_uppercase

Browse source
This commit is contained in:
j 2014-04-22 19:03:32 +02:00
parent d2a6511a95
commit 94ca01a041
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ox/format.py
View file

@ -21,7 +21,7 @@ def toAZ(num):
'CYWOQVJ' 'CYWOQVJ'
""" """
if num < 1: raise ValueError, "must supply a positive integer" if num < 1: raise ValueError, "must supply a positive integer"
digits = string.letters[26:] digits = string.ascii_uppercase
az = '' az = ''
while num != 0: while num != 0:
num, r = divmod(num, 26) num, r = divmod(num, 26)
@ -44,7 +44,7 @@ def fromAZ(num):
4461 4461
""" """
num = num.replace('-','') num = num.replace('-','')
digits = string.letters[26:] digits = string.ascii_uppercase
r = 0 r = 0
for exp, char in enumerate(reversed(num)): for exp, char in enumerate(reversed(num)):
r = r + (pow(26, exp) * (digits.index(char) + 1)) r = r + (pow(26, exp) * (digits.index(char) + 1))
@ -63,7 +63,7 @@ def to26(q):
'BDGKMAP' 'BDGKMAP'
""" """
if q < 0: raise ValueError, "must supply a positive integer" if q < 0: raise ValueError, "must supply a positive integer"
base26 = string.letters[26:] base26 = string.ascii_uppercase
converted = [] converted = []
while q != 0: while q != 0:
q, r = divmod(q, 26) q, r = divmod(q, 26)
@ -77,7 +77,7 @@ def from26(q):
>>> from26('A') >>> from26('A')
0 0
""" """
base26 = string.letters[26:] base26 = string.ascii_uppercase
q = q.replace('-','') q = q.replace('-','')
r = 0 r = 0
for i in q: for i in q:
@ -183,7 +183,7 @@ def from32(q):
'Y': 30, 'Y': 30,
'Z': 31, 'Z': 31,
} }
base32 = ('0123456789' +string.ascii_uppercase)[:32] base32 = ('0123456789' + string.ascii_uppercase)[:32]
q = q.replace('-','') q = q.replace('-','')
q = ''.join([base32[_32map[i.upper()]] for i in q]) q = ''.join([base32[_32map[i.upper()]] for i in q])
return int(q, 32) return int(q, 32)

4
ox/web/filmsdivision.py
View file

@ -4,11 +4,11 @@ import re
import string import string
import subprocess import subprocess
import ox import ox
import os
def get_ids(): def get_ids():
result = [] result = []
for i in string.letters[26:]: for i in string.ascii_uppercase:
url = "http://www.filmsdivision.org/search.php?title=%s" % i url = "http://www.filmsdivision.org/search.php?title=%s" % i
data = ox.cache.read_url(url) data = ox.cache.read_url(url)
links = re.compile('view_video.php\?movId=(.*?)[\'"]', re.DOTALL).findall(data) links = re.compile('view_video.php\?movId=(.*?)[\'"]', re.DOTALL).findall(data)