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

Typehints

Browse Source
This commit is contained in:
Eriks K 2021-02-03 13:36:26 +02:00
parent 632e4e8ad2
commit 47b3154c6a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erepublik/citizen.py
View File

@ -13,7 +13,7 @@ from requests import HTTPError, RequestException, Response
from . import access_points, classes, constants, types, utils from . import access_points, classes, constants, types, utils
from .classes import OfferItem from .classes import OfferItem
from .logging import ErepublikLogConsoleHandler, ErepublikFormatter, ErepublikFileHandler, ErepublikErrorHTTTPHandler from .logging import ErepublikErrorHTTTPHandler, ErepublikFileHandler, ErepublikFormatter, ErepublikLogConsoleHandler
class BaseCitizen(access_points.CitizenAPI): class BaseCitizen(access_points.CitizenAPI):

12
erepublik/logging.py
View File

@ -5,15 +5,15 @@ import logging
import os import os
import sys import sys
import weakref import weakref
from logging import LogRecord, handlers
from pathlib import Path from pathlib import Path
from typing import Any, Dict, Union
import requests import requests
from logging import handlers, LogRecord
from typing import Union, Dict, Any
from erepublik.classes import Reporter from erepublik.classes import Reporter
from erepublik.constants import erep_tz from erepublik.constants import erep_tz
from erepublik.utils import slugify, json_loads, json, now, json_dumps from erepublik.utils import json, json_dumps, json_loads, slugify
class ErepublikFileHandler(handlers.TimedRotatingFileHandler): class ErepublikFileHandler(handlers.TimedRotatingFileHandler):
@ -85,7 +85,7 @@ class ErepublikErrorHTTTPHandler(handlers.HTTPHandler):
def reporter(self): def reporter(self):
return self._reporter() return self._reporter()
def _get_last_response(self): def _get_last_response(self) -> Dict[str, str]:
response = self.reporter.citizen.r response = self.reporter.citizen.r
url = response.url url = response.url
last_index = url.index("?") if "?" in url else len(response.url) last_index = url.index("?") if "?" in url else len(response.url)
@ -107,7 +107,7 @@ class ErepublikErrorHTTTPHandler(handlers.HTTPHandler):
return dict(name=f"{resp_time}_{name}.{ext}", content=html.encode('utf-8'), return dict(name=f"{resp_time}_{name}.{ext}", content=html.encode('utf-8'),
mimetype="application/json" if ext == 'json' else "text/html") mimetype="application/json" if ext == 'json' else "text/html")
def _get_local_vars(self): def _get_local_vars(self) -> str:
trace = inspect.trace() trace = inspect.trace()
local_vars = {} local_vars = {}
if trace: if trace:
@ -128,7 +128,7 @@ class ErepublikErrorHTTTPHandler(handlers.HTTPHandler):
local_vars['citizen'] = repr(local_vars['citizen']) local_vars['citizen'] = repr(local_vars['citizen'])
return json_dumps(local_vars) return json_dumps(local_vars)
def _get_instance_json(self): def _get_instance_json(self) -> str:
if self.reporter: if self.reporter:
return self.reporter.citizen.to_json(False) return self.reporter.citizen.to_json(False)
return "" return ""