Sourcery Starbot ⭐ refactored wkunzhi/Python3-Spider #28
Conversation
| if abs(c_pixel[0] - ic_pixel[0]) < threshold and \ | ||
| abs(c_pixel[1] - ic_pixel[1]) < threshold and \ | ||
| abs(c_pixel[2] - ic_pixel[2]) < threshold: | ||
| return True | ||
| return False | ||
| return ( | ||
| abs(c_pixel[0] - ic_pixel[0]) < threshold | ||
| and abs(c_pixel[1] - ic_pixel[1]) < threshold | ||
| and abs(c_pixel[2] - ic_pixel[2]) < threshold | ||
| ) |
There was a problem hiding this comment.
Function LoginBli.is_pixel_similar refactored with the following changes:
- Lift code into else after jump in control flow (
reintroduce-else) - Replace if statement with if expression (
assign-if-exp) - Simplify boolean if expression (
boolean-if-exp-identity) - Remove unnecessary casts to int, str, float or bool (
remove-unnecessary-cast)
| if current < mid: | ||
| # 加速度为正2 | ||
| a = 20 | ||
| else: | ||
| # 加速度为负3 | ||
| a = -30 | ||
| a = 20 if current < mid else -30 |
There was a problem hiding this comment.
Function LoginBli.get_track refactored with the following changes:
- Replace if statement with if expression (
assign-if-exp)
This removes the following comments ( why? ):
# 加速度为正2
# 加速度为负3
| print('标题:' + title, 'ID', cid) | ||
| print(f'标题:{title}', 'ID', cid) | ||
| page = str(item['page']) | ||
| start_url = start_url + "/?p=" + page | ||
| start_url = f"{start_url}/?p={page}" |
There was a problem hiding this comment.
Function DownVideo.get_cid_list refactored with the following changes:
- Use f-string instead of string concatenation [×3] (
use-fstring-for-concatenation)
| params = 'appkey=%s&cid=%s&otype=json&qn=%s&quality=%s&type=' % (appkey, cid, quality, quality) | ||
| params = f'appkey={appkey}&cid={cid}&otype=json&qn={quality}&quality={quality}&type=' | ||
| chksum = hashlib.md5(bytes(params + sec, 'utf8')).hexdigest() | ||
| url_api = 'https://interface.bilibili.com/v2/playurl?%s&sign=%s' % (params, chksum) | ||
| url_api = f'https://interface.bilibili.com/v2/playurl?{params}&sign={chksum}' | ||
| headers = { | ||
| 'Referer': start_url, | ||
| 'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36' | ||
| } | ||
| html = requests.get(url_api, headers=headers).json() | ||
| video_list = [html['durl'][0]['url']] | ||
| return video_list | ||
| return [html['durl'][0]['url']] |
There was a problem hiding this comment.
Function DownVideo.get_play_list refactored with the following changes:
- Replace interpolated string formatting with f-string [×2] (
replace-interpolation-with-fstring) - Inline variable that is immediately returned (
inline-immediately-returned-variable)
| speed_str = " Speed: %s" % self.format_size(speed) | ||
| speed_str = f" Speed: {self.format_size(speed)}" |
There was a problem hiding this comment.
Function DownVideo.schedule_cmd refactored with the following changes:
- Replace interpolated string formatting with f-string (
replace-interpolation-with-fstring)
| result = {} | ||
| for item in offset_item: | ||
| css_class = item[0][1:] | ||
| x_offset = item[1] | ||
| y_offset = item[2] | ||
| result[css_class] = [x_offset, y_offset] | ||
| return result | ||
| return {item[0][1:]: [item[1], item[2]] for item in offset_item} |
There was a problem hiding this comment.
Function DianPing.get_css_offset refactored with the following changes:
- Convert for loop into dictionary comprehension (
dict-comprehension) - Inline variable that is only used once [×3] (
inline-variable) - Inline variable that is immediately returned (
inline-immediately-returned-variable)
| svg_list = [int(size), 'https:' + url] | ||
| svg_list = [int(size), f'https:{url}'] |
There was a problem hiding this comment.
Function DianPing.get_svg_url_dict refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
| print("餐馆: {}, 点评数: {}".format(shop_name, num)) | ||
| print(f"餐馆: {shop_name}, 点评数: {num}") |
There was a problem hiding this comment.
Function DianPing.get_comment_num refactored with the following changes:
- Replace call to format with f-string (
use-fstring-for-formatting)
| if 'uni' + clean_code in json_data: | ||
| return json_data['uni' + clean_code] | ||
| if f'uni{clean_code}' in json_data: | ||
| return json_data[f'uni{clean_code}'] |
There was a problem hiding this comment.
Function ParseFontClass.parse_ttf refactored with the following changes:
- Use f-string instead of string concatenation [×2] (
use-fstring-for-concatenation)
| with open(name + '.woff', 'wb+') as f: | ||
| f.write(requests.get('http://' + ttf_list[index]).content) # 下载写入 | ||
| font = TTFont(name + '.woff') | ||
| with open(f'{name}.woff', 'wb+') as f: | ||
| f.write(requests.get(f'http://{ttf_list[index]}').content) | ||
| font = TTFont(f'{name}.woff') | ||
| uni_list = font['cmap'].tables[0].ttFont.getGlyphOrder() # 取出字形保存到uniList中 | ||
| json_data = json.dumps(dict(zip(uni_list, self.FONT_LIST)), ensure_ascii=False) | ||
| self.add_hash(name, json_data) | ||
| os.remove(name + '.woff') # 用完了删掉，节省资源占用 | ||
| os.remove(f'{name}.woff') |
There was a problem hiding this comment.
Function ParseFontClass.install_ttf refactored with the following changes:
- Use f-string instead of string concatenation [×4] (
use-fstring-for-concatenation)
This removes the following comments ( why? ):
# 下载写入
# 用完了删掉，节省资源占用
| @@ -6,6 +6,7 @@ | |||
| 从网页下载一个字体文件获取对应推导式，动态获取请自行拓展 | |||
| """ | |||
|
|
|||
There was a problem hiding this comment.
Lines 18-18 refactored with the following changes:
- Replace list(), dict() or set() with comprehension (
collection-builtin-to-comprehension) - Replace unneeded comprehension with generator (
comprehension-to-generator)
This removes the following comments ( why? ):
# 对应关系数量转换
| self.url = 'https://v.douyin.com/' + path + '/' | ||
| self.url = f'https://v.douyin.com/{path}/' |
There was a problem hiding this comment.
Function ParseVideo.__init__ refactored with the following changes:
- Use f-string instead of string concatenation [×2] (
use-fstring-for-concatenation)
| result = re.search(r'itemId: "(.*?)",[\s\S]*?uid: "(.*?)",[\s\S]*?authorName: "(.*?)",[\s\S]*?dytk: "(.*?)"', | ||
| response.text) | ||
| return result | ||
| return re.search( | ||
| r'itemId: "(.*?)",[\s\S]*?uid: "(.*?)",[\s\S]*?authorName: "(.*?)",[\s\S]*?dytk: "(.*?)"', | ||
| response.text, | ||
| ) |
There was a problem hiding this comment.
Function ParseVideo.go_location refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
| url = 'https://www.iesdouyin.com/web/api/v2/aweme/iteminfo/?item_ids=' + ret.group(1) + '&dytk=' + ret.group(4) | ||
| url = f'https://www.iesdouyin.com/web/api/v2/aweme/iteminfo/?item_ids={ret.group(1)}&dytk={ret.group(4)}' |
There was a problem hiding this comment.
Function ParseVideo.go_message refactored with the following changes:
- Use f-string instead of string concatenation [×3] (
use-fstring-for-concatenation)
| _decrypt_result = pyDes.triple_des(key, pyDes.CBC, iv, None, pyDes.PAD_PKCS5).decrypt(data).decode('utf-8') | ||
| return _decrypt_result | ||
| return ( | ||
| pyDes.triple_des(key, pyDes.CBC, iv, None, pyDes.PAD_PKCS5) | ||
| .decrypt(data) | ||
| .decode('utf-8') | ||
| ) |
There was a problem hiding this comment.
Function TripleDesUtils.decrypt refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
| if None == pubkey: | ||
| if pubkey is None: |
There was a problem hiding this comment.
Function UseRSA.check_sign refactored with the following changes:
- Ensure constant in comparison is on the right (
flip-comparison) - Use x is None rather than x == None (
none-compare)
| en = k.encrypt(text, padmode=PAD_PKCS5) | ||
| return en | ||
| return k.encrypt(text, padmode=PAD_PKCS5) |
There was a problem hiding this comment.
Function UseDES.encrypt refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
| cipher_text = de.encrypt(text) | ||
| return cipher_text | ||
| return de.encrypt(text) |
There was a problem hiding this comment.
Function UseDES3.encrypt refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
| st = str(plain_text.decode("utf-8")).rstrip('\0') | ||
| return st | ||
| return str(plain_text.decode("utf-8")).rstrip('\0') |
There was a problem hiding this comment.
Function UseDES3.decrypt refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
| encrypts = sha.hexdigest() | ||
| return encrypts | ||
| return sha.hexdigest() |
There was a problem hiding this comment.
Function use_sha refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
| sign = js.call('get_pwd', pwd, publickey_mod, publickey_exp) | ||
| return sign | ||
| return js.call('get_pwd', pwd, publickey_mod, publickey_exp) |
There was a problem hiding this comment.
Function main refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
| msg = json.loads(response.content) | ||
| return msg | ||
| return json.loads(response.content) |
There was a problem hiding this comment.
Function ZGC.login refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
| text = _str + 'zol' | ||
| text = f'{_str}zol' | ||
| # 创建md5对象 | ||
| m = hashlib.md5() | ||
| m.update(text.encode(encoding='utf-8')) | ||
| str_md5 = m.hexdigest() | ||
| return str_md5 | ||
| return m.hexdigest() |
There was a problem hiding this comment.
Function ZGC.make_md5 refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation) - Inline variable that is immediately returned (
inline-immediately-returned-variable)
| url = 'https://open.e.189.cn/api/logbox/oauth2/unifyAccountLogin.do?sign=' + ret.group(1) + '&appId=' + ret.group( | ||
| 2) + '¶s=' + ret.group(3) + '&format=' + ret.group(4) + '&clientType=' + ret.group( | ||
| 5) + '&version=' + ret.group(6) | ||
| url = f'https://open.e.189.cn/api/logbox/oauth2/unifyAccountLogin.do?sign={ret.group(1)}&appId={ret.group(2)}¶s={ret.group(3)}&format={ret.group(4)}&clientType={ret.group(5)}&version={ret.group(6)}' |
There was a problem hiding this comment.
Function login refactored with the following changes:
- Use f-string instead of string concatenation [×11] (
use-fstring-for-concatenation)
| _key = self.js.call('get_key_iv', ret) | ||
| return _key | ||
| return self.js.call('get_key_iv', ret) |
There was a problem hiding this comment.
Function MakeParam.get_key_vi refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
| data = { | ||
| return { | ||
| 'account': self.user, | ||
| 'password': self.make_pwd(), | ||
| 'returnUrl': '/' | ||
| 'returnUrl': '/', | ||
| } | ||
| return data |
There was a problem hiding this comment.
Function YX.make_data refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
| @@ -8,13 +8,14 @@ | |||
| 需要 V8 引擎！ | |||
| """ | |||
|
|
|||
There was a problem hiding this comment.
Lines 17-17 refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
| tk = "tk0.29" + str(random.randint(104771190122337, 904771190122337)) + str(_time * 1000) | ||
| tk = f"tk0.29{random.randint(104771190122337, 904771190122337)}{str(_time * 1000)}" |
There was a problem hiding this comment.
Function BaiDu.make_dv refactored with the following changes:
- Use f-string instead of string concatenation [×2] (
use-fstring-for-concatenation) - Remove unnecessary calls to
str()from formatted values in f-strings (remove-str-from-fstring)
| response = requests.get('https://passport.baidu.com/cgi-bin/genimage?' + verify_str, cookies=self.cookies, | ||
| headers=headers_img) | ||
| response = requests.get( | ||
| f'https://passport.baidu.com/cgi-bin/genimage?{verify_str}', | ||
| cookies=self.cookies, | ||
| headers=headers_img, | ||
| ) |
There was a problem hiding this comment.
Function BaiDu.get_img refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
| url = 'https://passport.baidu.com/v2/sapi/authwidgetverify?authtoken=' + parse.quote( | ||
| token) + '&type=&jsonp=1&apiver=v3&verifychannel=&action=getapi&vcode=&questionAndAnswer=&needsid=&rsakey=&countrycode=&u=https%3A%2F%2Fpassport.qatest.baidu.com%2F%3Fgetpassresetpwd&tpl=&winsdk=&authAction=&callback=bd__cbs__oeq73u' | ||
| url = f'https://passport.baidu.com/v2/sapi/authwidgetverify?authtoken={parse.quote(token)}&type=&jsonp=1&apiver=v3&verifychannel=&action=getapi&vcode=&questionAndAnswer=&needsid=&rsakey=&countrycode=&u=https%3A%2F%2Fpassport.qatest.baidu.com%2F%3Fgetpassresetpwd&tpl=&winsdk=&authAction=&callback=bd__cbs__oeq73u' |
There was a problem hiding this comment.
Function BaiDu.get_phone refactored with the following changes:
- Use f-string instead of string concatenation [×2] (
use-fstring-for-concatenation)
Thanks for starring sourcery-ai/sourcery ✨ 🌟 ✨
Here's your pull request refactoring your most popular Python repo.
If you want Sourcery to refactor all your Python repos and incoming pull requests install our bot.
Review changes via command line
To manually merge these changes, make sure you're on the
masterbranch, then run: