minor refactoring

This commit is contained in:
trevorhobenshield
2023-06-07 12:13:19 -07:00
parent 00f6325bcb
commit ef9ca62fca
3 changed files with 9 additions and 9 deletions

View File

@@ -14,7 +14,7 @@ install_requires = [
setup(
name="twitter-api-client",
version="0.9.2",
version="0.9.3",
python_requires=">=3.10.10",
description="Twitter API",
long_description=dedent('''

View File

@@ -35,8 +35,8 @@ if platform.system() != 'Windows':
class Account:
def __init__(self, email: str = None, username: str = None, password: str = None, session: Client = None, **kwargs):
self.logger = self.init_logger(kwargs.get('log_config', False))
self.session = self.validate_session(email, username, password, session, **kwargs)
self.logger = self._init_logger(kwargs.get('log_config', False))
self.session = self._validate_session(email, username, password, session, **kwargs)
self.save = kwargs.get('save', True)
self.debug = kwargs.get('debug', 0)
self.gql_api = 'https://twitter.com/i/api/graphql'
@@ -557,7 +557,7 @@ class Account:
return r
@staticmethod
def init_logger(cfg: dict) -> Logger:
def _init_logger(cfg: dict) -> Logger:
if cfg:
logging.config.dictConfig(cfg)
else:
@@ -571,7 +571,7 @@ class Account:
return logging.getLogger(LOGGER_NAME)
@staticmethod
def validate_session(*args, **kwargs):
def _validate_session(*args, **kwargs):
email, username, password, session = args
if session and all(session.cookies.get(c) for c in {'ct0', 'auth_token'}):
# authenticated session provided

View File

@@ -36,8 +36,8 @@ if platform.system() != 'Windows':
class Search:
def __init__(self, email: str = None, username: str = None, password: str = None, session: Client = None, **kwargs):
self.logger = self.init_logger(kwargs.get('log_config', False))
self.session = self.validate_session(email, username, password, session, **kwargs)
self.logger = self._init_logger(kwargs.get('log_config', False))
self.session = self._validate_session(email, username, password, session, **kwargs)
self.api = 'https://api.twitter.com/2/search/adaptive.json?'
self.save = kwargs.get('save', True)
self.debug = kwargs.get('debug', 0)
@@ -135,7 +135,7 @@ class Search:
return p
@staticmethod
def init_logger(cfg: dict) -> Logger:
def _init_logger(cfg: dict) -> Logger:
if cfg:
logging.config.dictConfig(cfg)
else:
@@ -149,7 +149,7 @@ class Search:
return logging.getLogger(LOGGER_NAME)
@staticmethod
def validate_session(*args, **kwargs):
def _validate_session(*args, **kwargs):
email, username, password, session = args
if session and all(session.cookies.get(c) for c in {'ct0', 'auth_token'}):
# authenticated session provided