eriks/erepublik-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove requests

Browse Source
This commit is contained in:
KEriks 2022-03-21 15:21:28 +02:00
parent c4933de237
commit 15eb3ac8a0
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erepublik/_logging.py
View File

@ -9,7 +9,7 @@ from logging import LogRecord, handlers
from pathlib import Path from pathlib import Path
from typing import Any, Dict, Union from typing import Any, Dict, Union
import requests from httpx import post
from erepublik.classes import Reporter from erepublik.classes import Reporter
from erepublik.constants import erep_tz from erepublik.constants import erep_tz
@ -209,6 +209,6 @@ class ErepublikErrorHTTTPHandler(handlers.HTTPHandler):
headers = {"Authorization": s} headers = {"Authorization": s}
data = self.mapLogRecord(record) data = self.mapLogRecord(record)
files = data.pop("files") if "files" in data else None files = data.pop("files") if "files" in data else None
requests.post(f"{proto}://{self.host}{self.url}", headers=headers, data=data, files=files) post(f"{proto}://{self.host}{self.url}", headers=headers, data=data, files=files)
except Exception: except Exception:
self.handleError(record) self.handleError(record)

2
erepublik/access_points.py
View File

@ -5,7 +5,7 @@ import time
from typing import Any, Dict, List, Mapping, Union from typing import Any, Dict, List, Mapping, Union
from httpx import Response, Client as Session, RequestError from httpx import Response, Client as Session, RequestError
from requests_toolbelt.utils import dump #from requests_toolbelt.utils import dump
from erepublik import constants, utils from erepublik import constants, utils

6
erepublik/citizen.py
View File

@ -9,7 +9,7 @@ from threading import Event
from time import sleep from time import sleep
from typing import Any, Dict, List, NoReturn, Optional, Set, Tuple, TypedDict, Union from typing import Any, Dict, List, NoReturn, Optional, Set, Tuple, TypedDict, Union
from httpx import RequestException, Response from httpx import RequestError, Response
from erepublik import _types as types from erepublik import _types as types
from erepublik import access_points, classes, constants, utils from erepublik import access_points, classes, constants, utils
@ -118,7 +118,7 @@ class BaseCitizen(access_points.CitizenAPI):
else: else:
try: try:
response = super().get(url, **kwargs) response = super().get(url, **kwargs)
except RequestException: except RequestError:
self.report_error("Network error while issuing GET request") self.report_error("Network error while issuing GET request")
self.sleep(60) self.sleep(60)
return self.get(url, **kwargs) return self.get(url, **kwargs)
@ -151,7 +151,7 @@ class BaseCitizen(access_points.CitizenAPI):
try: try:
response = super().post(url, data=data, json=json, **kwargs) response = super().post(url, data=data, json=json, **kwargs)
except RequestException: except RequestError:
self.report_error("Network error while issuing POST request") self.report_error("Network error while issuing POST request")
self.sleep(60) self.sleep(60)
return self.post(url, data=data, json=json, **kwargs) return self.post(url, data=data, json=json, **kwargs)

4
erepublik/classes.py
View File

@ -7,7 +7,7 @@ from decimal import Decimal
from io import BytesIO from io import BytesIO
from typing import Any, Dict, Generator, Iterable, List, NamedTuple, NoReturn, Optional, Tuple, Union from typing import Any, Dict, Generator, Iterable, List, NamedTuple, NoReturn, Optional, Tuple, Union
from requests import HTTPError, Response, Session, post from httpx import HTTPError, Response, Client as Session, post
from erepublik import _types as types from erepublik import _types as types
from erepublik import constants, utils from erepublik import constants, utils
@ -772,7 +772,7 @@ class Reporter:
def __init__(self, citizen): def __init__(self, citizen):
self._citizen = weakref.ref(citizen) self._citizen = weakref.ref(citizen)
self._req = Session() self._req = Session(follow_redirects=True)
self.url = "https://erep.lv" self.url = "https://erep.lv"
self._req.headers.update({"user-agent": "eRepublik Script Reporter v3", "erep-version": utils.__version__}) self._req.headers.update({"user-agent": "eRepublik Script Reporter v3", "erep-version": utils.__version__})
self.__to_update = [] self.__to_update = []

8
erepublik/utils.py
View File

@ -12,8 +12,8 @@ from pathlib import Path
from typing import Any, Dict, List, Union from typing import Any, Dict, List, Union
import pytz import pytz
import requests import httpx
from requests import Response from httpx import Response
from erepublik import __version__, constants from erepublik import __version__, constants
@ -204,7 +204,7 @@ def calculate_hit(
def get_ground_hit_dmg_value( def get_ground_hit_dmg_value(
citizen_id: int, natural_enemy: bool = False, true_patriot: bool = False, booster: int = 0, weapon_power: int = 200 citizen_id: int, natural_enemy: bool = False, true_patriot: bool = False, booster: int = 0, weapon_power: int = 200
) -> Decimal: ) -> Decimal:
r = requests.get(f"https://www.erepublik.com/en/main/citizen-profile-json/{citizen_id}").json() r = httpx.get(f"https://www.erepublik.com/en/main/citizen-profile-json/{citizen_id}").json()
rang = r["military"]["militaryData"]["ground"]["rankNumber"] rang = r["military"]["militaryData"]["ground"]["rankNumber"]
strength = r["military"]["militaryData"]["ground"]["strength"] strength = r["military"]["militaryData"]["ground"]["strength"]
elite = r["citizenAttributes"]["level"] > 100 elite = r["citizenAttributes"]["level"] > 100
@ -217,7 +217,7 @@ def get_ground_hit_dmg_value(
def get_air_hit_dmg_value( def get_air_hit_dmg_value(
citizen_id: int, natural_enemy: bool = False, true_patriot: bool = False, booster: int = 0, weapon_power: int = 0 citizen_id: int, natural_enemy: bool = False, true_patriot: bool = False, booster: int = 0, weapon_power: int = 0
) -> Decimal: ) -> Decimal:
r = requests.get(f"https://www.erepublik.com/en/main/citizen-profile-json/{citizen_id}").json() r = httpx.get(f"https://www.erepublik.com/en/main/citizen-profile-json/{citizen_id}").json()
rang = r["military"]["militaryData"]["aircraft"]["rankNumber"] rang = r["military"]["militaryData"]["aircraft"]["rankNumber"]
elite = r["citizenAttributes"]["level"] > 100 elite = r["citizenAttributes"]["level"] > 100
return calculate_hit(0, rang, true_patriot, elite, natural_enemy, booster, weapon_power) return calculate_hit(0, rang, true_patriot, elite, natural_enemy, booster, weapon_power)