From 5ce4c62f22feee7ad44e369ec73fe3f24e5e80c4 Mon Sep 17 00:00:00 2001 From: Eriks K Date: Sat, 23 Oct 2021 16:30:18 +0300 Subject: [PATCH] =?UTF-8?q?Bump=20version:=200.27.0=20=E2=86=92=200.27.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erepublik/__init__.py | 2 +- erepublik/access_points.py | 5 +++-- erepublik/citizen.py | 10 ++++++---- setup.cfg | 2 +- setup.py | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/erepublik/__init__.py b/erepublik/__init__.py index 1c411fa..4da58d9 100644 --- a/erepublik/__init__.py +++ b/erepublik/__init__.py @@ -4,7 +4,7 @@ __author__ = """Eriks Karls""" __email__ = "eriks@72.lv" -__version__ = "0.27.0" +__version__ = "0.27.1" from erepublik.citizen import Citizen diff --git a/erepublik/access_points.py b/erepublik/access_points.py index fe7523d..17fce96 100644 --- a/erepublik/access_points.py +++ b/erepublik/access_points.py @@ -90,7 +90,7 @@ class SlowRequests(Session): fd_path = "debug/requests" fd_time = self.last_time.strftime("%Y/%m/%d/%H-%M-%S") - fd_name = utils.slugify(url[len(CitizenBaseAPI.url):]) + fd_name = utils.slugify(url[len(CitizenBaseAPI.url) :]) fd_extra = "_REDIRECT" if redirect else "" try: @@ -191,7 +191,8 @@ class CitizenBaseAPI: session_hash = hashlib.sha256(",".join(env["l"] + env["s"]).encode("utf8")).hexdigest() cookies_hash = hashlib.sha256(",".join(env["c"]).encode("utf8")).hexdigest() - cookie_kwargs = dict(expires=int(time.time()) + 120, path="/en/main/sessionUnlock", domain=".www.erepublik.com", secure=True, rest={"HttpOnly": True} + cookie_kwargs = dict( + expires=int(time.time()) + 120, path="/en/main/sessionUnlock", domain=".www.erepublik.com", secure=True, rest={"HttpOnly": True} ) self._req.cookies.set("sh", session_hash, **cookie_kwargs) self._req.cookies.set("ch", cookies_hash, **cookie_kwargs) diff --git a/erepublik/citizen.py b/erepublik/citizen.py index bfb4024..fe6c2dd 100644 --- a/erepublik/citizen.py +++ b/erepublik/citizen.py @@ -7,7 +7,7 @@ from decimal import Decimal from itertools import product from threading import Event from time import sleep -from typing import Any, Dict, List, NoReturn, Optional, Set, Tuple, Union, TypedDict +from typing import Any, Dict, List, NoReturn, Optional, Set, Tuple, TypedDict, Union from requests import HTTPError, RequestException, Response @@ -288,9 +288,11 @@ class BaseCitizen(access_points.CitizenAPI): message: str result: Optional[List[ApiResult]] - solve_data = ApiReturn(**self.post( - "https://api.erep.lv/captcha/api", data=dict(citizen_id=self.details.citizen_id, src=src, password="CaptchaDevAPI") - ).json()) + solve_data = ApiReturn( + **self.post( + "https://api.erep.lv/captcha/api", data=dict(citizen_id=self.details.citizen_id, src=src, password="CaptchaDevAPI") + ).json() + ) if solve_data["status"]: return solve_data["result"] diff --git a/setup.cfg b/setup.cfg index 9dc0353..e6445de 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.27.0 +current_version = 0.27.1 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)\.?(?P\d+)? diff --git a/setup.py b/setup.py index f5e3bef..953fd8f 100644 --- a/setup.py +++ b/setup.py @@ -50,6 +50,6 @@ setup( test_suite="tests", tests_require=test_requirements, url="https://github.com/eeriks/erepublik/", - version="0.27.0", + version="0.27.1", zip_safe=False, )