projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[utils] Merge base_n functions
[youtube-dl]
/
youtube_dl
/
utils.py
diff --git
a/youtube_dl/utils.py
b/youtube_dl/utils.py
index be1f3b0d77a55a3245b5cff44982256e072d6c0e..900e07a8ec74f529e7bca0eec8b6bafb39ff5faf 100644
(file)
--- a/
youtube_dl/utils.py
+++ b/
youtube_dl/utils.py
@@
-2621,19
+2621,17
@@
def ohdave_rsa_encrypt(data, exponent, modulus):
return '%x' % encrypted
return '%x' % encrypted
-def base_n(num, n, table):
+def base_n(num, n, table
=None
):
if num == 0:
return '0'
if num == 0:
return '0'
+
+ FULL_TABLE = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+ assert n <= len(FULL_TABLE)
+ if not table:
+ table = FULL_TABLE[:n]
+
ret = ''
while num:
ret = table[num % n] + ret
num = num // n
return ret
ret = ''
while num:
ret = table[num % n] + ret
num = num // n
return ret
-
-
-def base36(num):
- return base_n(num, 36, '0123456789abcdefghijklmnopqrstuvwxyz')
-
-
-def base62(num):
- return base_n(num, 62, '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')