Replace double quote type annotations with single quotes

This commit is contained in:
Kai A. Hiller
2018-08-09 14:36:14 +02:00
parent 66683151ec
commit 81531235bc
6 changed files with 16 additions and 16 deletions
+2 -2
View File
@@ -156,14 +156,14 @@ class AbstractUser(ABC):
and (not self.is_bot or allow_bot) and (not self.is_bot or allow_bot)
and await self.is_logged_in()) and await self.is_logged_in())
async def start(self, delete_unless_authenticated: bool = False) -> "AbstractUser": async def start(self, delete_unless_authenticated: bool = False) -> 'AbstractUser':
if not self.client: if not self.client:
self._init_client() self._init_client()
await self.client.connect() await self.client.connect()
self.log.debug("%s connected: %s", self.mxid, self.connected) self.log.debug("%s connected: %s", self.mxid, self.connected)
return self return self
async def ensure_started(self, even_if_no_session=False) -> "AbstractUser": async def ensure_started(self, even_if_no_session=False) -> 'AbstractUser':
if not self.puppet_whitelisted: if not self.puppet_whitelisted:
return self return self
self.log.debug("ensure_started(%s, connected=%s, even_if_no_session=%s, session_count=%s)", self.log.debug("ensure_started(%s, connected=%s, even_if_no_session=%s, session_count=%s)",
+1 -1
View File
@@ -71,7 +71,7 @@ class Bot(AbstractUser):
if isinstance(id, int): if isinstance(id, int):
self.tg_whitelist.append(id) self.tg_whitelist.append(id)
async def start(self, delete_unless_authenticated: bool = False) -> "Bot": async def start(self, delete_unless_authenticated: bool = False) -> 'Bot':
await super().start(delete_unless_authenticated) await super().start(delete_unless_authenticated)
if not await self.is_logged_in(): if not await self.is_logged_in():
await self.client.sign_in(bot_token=self.token) await self.client.sign_in(bot_token=self.token)
+1 -1
View File
@@ -26,7 +26,7 @@ ManagementRoom = NewType('ManagementRoom', Tuple[MatrixRoomID, MatrixUserID])
async def _find_rooms(intent: IntentAPI) -> Tuple[List[ManagementRoom], List[MatrixRoomID], async def _find_rooms(intent: IntentAPI) -> Tuple[List[ManagementRoom], List[MatrixRoomID],
List["po.Portal"], List["po.Portal"]]: List['po.Portal'], List['po.Portal']]:
management_rooms = [] # type: List[ManagementRoom] management_rooms = [] # type: List[ManagementRoom]
unidentified_rooms = [] # type: List[MatrixRoomID] unidentified_rooms = [] # type: List[MatrixRoomID]
portals = [] # type: List[po.Portal] portals = [] # type: List[po.Portal]
@@ -87,7 +87,7 @@ class TelegramMessage:
self.text = text # type: str self.text = text # type: str
self.entities = entities or [] # type: List[TypeMessageEntity] self.entities = entities or [] # type: List[TypeMessageEntity]
def offset_entities(self, offset: int) -> "TelegramMessage": def offset_entities(self, offset: int) -> 'TelegramMessage':
def apply_offset(entity: TypeMessageEntity, inner_offset: int def apply_offset(entity: TypeMessageEntity, inner_offset: int
) -> Optional[TypeMessageEntity]: ) -> Optional[TypeMessageEntity]:
entity = Entity.copy(entity) entity = Entity.copy(entity)
@@ -104,7 +104,7 @@ class TelegramMessage:
self.entities = [x for x in self.entities if x is not None] self.entities = [x for x in self.entities if x is not None]
return self return self
def append(self, *args: Union[str, "TelegramMessage"]) -> "TelegramMessage": def append(self, *args: Union[str, 'TelegramMessage']) -> 'TelegramMessage':
for msg in args: for msg in args:
if isinstance(msg, str): if isinstance(msg, str):
msg = TelegramMessage(text=msg) msg = TelegramMessage(text=msg)
@@ -112,7 +112,7 @@ class TelegramMessage:
self.text += msg.text self.text += msg.text
return self return self
def prepend(self, *args: Union[str, "TelegramMessage"]) -> "TelegramMessage": def prepend(self, *args: Union[str, 'TelegramMessage']) -> 'TelegramMessage':
for msg in args: for msg in args:
if isinstance(msg, str): if isinstance(msg, str):
msg = TelegramMessage(text=msg) msg = TelegramMessage(text=msg)
@@ -121,16 +121,16 @@ class TelegramMessage:
return self return self
def format(self, entity_type: Type[TypeMessageEntity], offset: int = None, length: int = None, def format(self, entity_type: Type[TypeMessageEntity], offset: int = None, length: int = None,
**kwargs) -> "TelegramMessage": **kwargs) -> 'TelegramMessage':
self.entities.append(entity_type(offset=offset or 0, self.entities.append(entity_type(offset=offset or 0,
length=length if length is not None else len(self.text), length=length if length is not None else len(self.text),
**kwargs)) **kwargs))
return self return self
def concat(self, *args: Union[str, "TelegramMessage"]) -> "TelegramMessage": def concat(self, *args: Union[str, 'TelegramMessage']) -> 'TelegramMessage':
return TelegramMessage().append(self, *args) return TelegramMessage().append(self, *args)
def trim(self) -> "TelegramMessage": def trim(self) -> 'TelegramMessage':
orig_len = len(self.text) orig_len = len(self.text)
self.text = self.text.lstrip() self.text = self.text.lstrip()
diff = orig_len - len(self.text) diff = orig_len - len(self.text)
@@ -138,7 +138,7 @@ class TelegramMessage:
self.offset_entities(-diff) self.offset_entities(-diff)
return self return self
def split(self, separator, max_items: int = 0) -> List["TelegramMessage"]: def split(self, separator, max_items: int = 0) -> List['TelegramMessage']:
text_parts = self.text.split(separator, max_items - 1) text_parts = self.text.split(separator, max_items - 1)
output = [] # type: List[TelegramMessage] output = [] # type: List[TelegramMessage]
@@ -158,8 +158,8 @@ class TelegramMessage:
return output return output
@staticmethod @staticmethod
def join(items: Sequence[Union[str, "TelegramMessage"]], def join(items: Sequence[Union[str, 'TelegramMessage']],
separator: str = " ") -> "TelegramMessage": separator: str = " ") -> 'TelegramMessage':
main = TelegramMessage() main = TelegramMessage()
for msg in items: for msg in items:
if isinstance(msg, str): if isinstance(msg, str):
+1 -1
View File
@@ -1700,7 +1700,7 @@ class Portal:
self.deleted = True self.deleted = True
@classmethod @classmethod
def from_db(cls, db_portal: DBPortal) -> "Portal": def from_db(cls, db_portal: DBPortal) -> 'Portal':
return Portal(tgid=db_portal.tgid, tg_receiver=db_portal.tg_receiver, return Portal(tgid=db_portal.tgid, tg_receiver=db_portal.tg_receiver,
peer_type=db_portal.peer_type, mxid=db_portal.mxid, peer_type=db_portal.peer_type, mxid=db_portal.mxid,
username=db_portal.username, megagroup=db_portal.megagroup, username=db_portal.username, megagroup=db_portal.megagroup,
+2 -2
View File
@@ -141,14 +141,14 @@ class User(AbstractUser):
self.db.commit() self.db.commit()
@classmethod @classmethod
def from_db(cls, db_user: DBUser) -> "User": def from_db(cls, db_user: DBUser) -> 'User':
return User(db_user.mxid, db_user.tgid, db_user.tg_username, db_user.contacts, return User(db_user.mxid, db_user.tgid, db_user.tg_username, db_user.contacts,
False, db_user.saved_contacts, db_user.portals, db_instance=db_user) False, db_user.saved_contacts, db_user.portals, db_instance=db_user)
# endregion # endregion
# region Telegram connection management # region Telegram connection management
async def start(self, delete_unless_authenticated: bool = False) -> "User": async def start(self, delete_unless_authenticated: bool = False) -> 'User':
await super().start() await super().start()
if await self.is_logged_in(): if await self.is_logged_in():
self.log.debug(f"Ensuring post_login() for {self.name}") self.log.debug(f"Ensuring post_login() for {self.name}")