github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace remaining instances of base64 with binascii

Browse Source
This commit is contained in:
Mike Fährmann
2023-03-02 18:25:47 +01:00
parent 83e7a25b6b
commit dd88740ec7
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gallery_dl/extractor/oauth.py
View File

@@ -14,8 +14,8 @@ from .. import text, oauth, util, config, exception
from ..output import stdout_write from ..output import stdout_write
from ..cache import cache from ..cache import cache
import urllib.parse import urllib.parse
import binascii
import hashlib import hashlib
import base64
REDIRECT_URI_LOCALHOST = "http://localhost:6414/" REDIRECT_URI_LOCALHOST = "http://localhost:6414/"
REDIRECT_URI_HTTPS = "https://mikf.github.io/gallery-dl/oauth-redirect.html" REDIRECT_URI_HTTPS = "https://mikf.github.io/gallery-dl/oauth-redirect.html"
@@ -392,9 +392,9 @@ class OAuthPixiv(OAuthBase):
yield Message.Version, 1 yield Message.Version, 1
code_verifier = util.generate_token(32) code_verifier = util.generate_token(32)
digest = hashlib.sha256(code_verifier.encode("ascii")).digest() digest = hashlib.sha256(code_verifier.encode()).digest()
code_challenge = base64.urlsafe_b64encode( code_challenge = binascii.b2a_base64(
digest).rstrip(b"=").decode("ascii") digest)[:-2].decode().replace("+", "-").replace("/", "_")
url = "https://app-api.pixiv.net/web/v1/login" url = "https://app-api.pixiv.net/web/v1/login"
params = { params = {

4
gallery_dl/extractor/photobucket.py
View File

@@ -10,7 +10,7 @@
from .common import Extractor, Message from .common import Extractor, Message
from .. import text, exception from .. import text, exception
import base64 import binascii
import json import json
@@ -168,7 +168,7 @@ class PhotobucketImageExtractor(Extractor):
image["titleOrFilename"] = image["title"] or name image["titleOrFilename"] = image["title"] or name
image["tags"] = image.pop("clarifaiTagList", []) image["tags"] = image.pop("clarifaiTagList", [])
mtype, _, mid = base64.b64decode(image["id"]).partition(b":") mtype, _, mid = binascii.a2b_base64(image["id"]).partition(b":")
image["pictureId"] = mid.decode() if mtype == b"mediaId" else "" image["pictureId"] = mid.decode() if mtype == b"mediaId" else ""
yield Message.Directory, image yield Message.Directory, image

4
gallery_dl/oauth.py
View File

@@ -10,10 +10,10 @@
import hmac import hmac
import time import time
import base64
import random import random
import string import string
import hashlib import hashlib
import binascii
import urllib.parse import urllib.parse
import requests import requests
@@ -100,7 +100,7 @@ class OAuth1Client(requests.auth.AuthBase):
key = concat(self.consumer_secret, self.token_secret or "").encode() key = concat(self.consumer_secret, self.token_secret or "").encode()
signature = hmac.new(key, message, hashlib.sha1).digest() signature = hmac.new(key, message, hashlib.sha1).digest()
return quote(base64.b64encode(signature).decode()) return quote(binascii.b2a_base64(signature)[:-1].decode())
class OAuth1API(): class OAuth1API():