Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix conflicts with black and flake8/reorder-imports #260

Merged
merged 1 commit into from Feb 13, 2024
Merged

fix conflicts with black and flake8/reorder-imports #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@ repos:
- id: trailing-whitespace
- id: double-quote-string-fixer
- repo: https://github.com/psf/black
rev: '23.12.1'
rev: '24.2.0'
hooks:
- id: black
args:
Expand Down Expand Up @@ -60,5 +60,5 @@ repos:
- id: flake8
args:
- "--ignore"
- "E501,E704,E301,W503"
- "E501,E704,E301,W503,E701"
files: ahk\/(?!_sync).*
5 changes: 1 addition & 4 deletions _tests_setup.py
View file
Open in desktop
@@ -1,7 +1,4 @@
"""
Not a real setup package
This is just to unasync our tests files
"""
# Not a real setup package. This is just to unasync our tests files
import setuptools
import unasync

Expand Down
15 changes: 5 additions & 10 deletions ahk/_async/transport.py
View file
Open in desktop
Expand Up @@ -58,8 +58,7 @@
T_SyncFuture = TypeVar('T_SyncFuture')


class AHKProtocolError(Exception):
...
class AHKProtocolError(Exception): ...


class AsyncFutureResult(Generic[T_AsyncFuture]): # unasync: remove
Expand Down Expand Up @@ -191,8 +190,7 @@ def result(self, timeout: Optional[float] = None) -> T_SyncFuture:

@runtime_checkable
class Killable(Protocol):
def kill(self) -> None:
...
def kill(self) -> None: ...


def kill(proc: Killable) -> None:
Expand All @@ -213,17 +211,14 @@ def async_assert_send_nonblocking_type_correct(
class Communicable(Protocol):
runargs: List[str]

def communicate(self, input_bytes: Optional[bytes], timeout: Optional[int] = None) -> Tuple[bytes, bytes]:
...
def communicate(self, input_bytes: Optional[bytes], timeout: Optional[int] = None) -> Tuple[bytes, bytes]: ...

async def acommunicate( # unasync: remove
self, input_bytes: Optional[bytes], timeout: Optional[int] = None
) -> Tuple[bytes, bytes]:
...
) -> Tuple[bytes, bytes]: ...

@property
def returncode(self) -> Optional[int]:
...
def returncode(self) -> Optional[int]: ...


class AsyncAHKProcess:
Expand Down
39 changes: 13 additions & 26 deletions ahk/_async/window.py
View file
Open in desktop
Expand Up @@ -25,8 +25,7 @@
from .transport import AsyncFutureResult


class WindowNotFoundException(Exception):
...
class WindowNotFoundException(Exception): ...


AsyncPropertyReturnStr: TypeAlias = Coroutine[None, None, str] # unasync: remove
Expand Down Expand Up @@ -535,20 +534,16 @@ async def redraw(self, *, blocking: bool = True) -> Union[None, AsyncFutureResul
)

@overload
async def set_style(self, style: str) -> bool:
...
async def set_style(self, style: str) -> bool: ...

@overload
async def set_style(self, style: str, *, blocking: Literal[True]) -> bool:
...
async def set_style(self, style: str, *, blocking: Literal[True]) -> bool: ...

@overload
async def set_style(self, style: str, *, blocking: Literal[False]) -> AsyncFutureResult[bool]:
...
async def set_style(self, style: str, *, blocking: Literal[False]) -> AsyncFutureResult[bool]: ...

@overload
async def set_style(self, style: str, *, blocking: bool = True) -> Union[bool, AsyncFutureResult[bool]]:
...
async def set_style(self, style: str, *, blocking: bool = True) -> Union[bool, AsyncFutureResult[bool]]: ...

async def set_style(self, style: str, *, blocking: bool = True) -> Union[bool, AsyncFutureResult[bool]]:
return await self._engine.win_set_style(
Expand All @@ -560,20 +555,16 @@ async def set_style(self, style: str, *, blocking: bool = True) -> Union[bool, A
)

@overload
async def set_ex_style(self, style: str) -> bool:
...
async def set_ex_style(self, style: str) -> bool: ...

@overload
async def set_ex_style(self, style: str, *, blocking: Literal[False]) -> AsyncFutureResult[bool]:
...
async def set_ex_style(self, style: str, *, blocking: Literal[False]) -> AsyncFutureResult[bool]: ...

@overload
async def set_ex_style(self, style: str, *, blocking: Literal[True]) -> bool:
...
async def set_ex_style(self, style: str, *, blocking: Literal[True]) -> bool: ...

@overload
async def set_ex_style(self, style: str, *, blocking: bool = True) -> Union[bool, AsyncFutureResult[bool]]:
...
async def set_ex_style(self, style: str, *, blocking: bool = True) -> Union[bool, AsyncFutureResult[bool]]: ...

async def set_ex_style(self, style: str, *, blocking: bool = True) -> Union[bool, AsyncFutureResult[bool]]:
return await self._engine.win_set_ex_style(
Expand All @@ -585,20 +576,16 @@ async def set_ex_style(self, style: str, *, blocking: bool = True) -> Union[bool
)

@overload
async def set_region(self, options: str) -> bool:
...
async def set_region(self, options: str) -> bool: ...

@overload
async def set_region(self, options: str, *, blocking: Literal[True]) -> bool:
...
async def set_region(self, options: str, *, blocking: Literal[True]) -> bool: ...

@overload
async def set_region(self, options: str, *, blocking: Literal[False]) -> AsyncFutureResult[bool]:
...
async def set_region(self, options: str, *, blocking: Literal[False]) -> AsyncFutureResult[bool]: ...

@overload
async def set_region(self, options: str, *, blocking: bool = True) -> Union[bool, AsyncFutureResult[bool]]:
...
async def set_region(self, options: str, *, blocking: bool = True) -> Union[bool, AsyncFutureResult[bool]]: ...

async def set_region(self, options: str, *, blocking: bool = True) -> Union[bool, AsyncFutureResult[bool]]:
return await self._engine.win_set_region(
Expand Down
6 changes: 2 additions & 4 deletions ahk/_hotkey.py
View file
Open in desktop
Expand Up @@ -158,8 +158,7 @@ def on_clipboard_change(
self.restart()


class STOP:
...
class STOP: ...


class ThreadedHotkeyTransport(HotkeyTransportBase):
Expand Down Expand Up @@ -453,8 +452,7 @@ def _validate(self) -> None:

@runtime_checkable
class Killable(Protocol):
def kill(self) -> None:
...
def kill(self) -> None: ...


def kill(proc: Killable) -> None:
Expand Down
12 changes: 4 additions & 8 deletions ahk/_sync/transport.py
View file
Open in desktop
Expand Up @@ -57,8 +57,7 @@
T_SyncFuture = TypeVar('T_SyncFuture')


class AHKProtocolError(Exception):
...
class AHKProtocolError(Exception): ...



Expand Down Expand Up @@ -183,8 +182,7 @@ def result(self, timeout: Optional[float] = None) -> T_SyncFuture:

@runtime_checkable
class Killable(Protocol):
def kill(self) -> None:
...
def kill(self) -> None: ...


def kill(proc: Killable) -> None:
Expand All @@ -205,13 +203,11 @@ def async_assert_send_nonblocking_type_correct(
class Communicable(Protocol):
runargs: List[str]

def communicate(self, input_bytes: Optional[bytes], timeout: Optional[int] = None) -> Tuple[bytes, bytes]:
...
def communicate(self, input_bytes: Optional[bytes], timeout: Optional[int] = None) -> Tuple[bytes, bytes]: ...


@property
def returncode(self) -> Optional[int]:
...
def returncode(self) -> Optional[int]: ...


class SyncAHKProcess:
Expand Down
39 changes: 13 additions & 26 deletions ahk/_sync/window.py
View file
Open in desktop
Expand Up @@ -25,8 +25,7 @@
from .transport import FutureResult


class WindowNotFoundException(Exception):
...
class WindowNotFoundException(Exception): ...


SyncPropertyReturnStr: TypeAlias = str
Expand Down Expand Up @@ -514,20 +513,16 @@ def redraw(self, *, blocking: bool = True) -> Union[None, FutureResult[None]]:
)

@overload
def set_style(self, style: str) -> bool:
...
def set_style(self, style: str) -> bool: ...

@overload
def set_style(self, style: str, *, blocking: Literal[True]) -> bool:
...
def set_style(self, style: str, *, blocking: Literal[True]) -> bool: ...

@overload
def set_style(self, style: str, *, blocking: Literal[False]) -> FutureResult[bool]:
...
def set_style(self, style: str, *, blocking: Literal[False]) -> FutureResult[bool]: ...

@overload
def set_style(self, style: str, *, blocking: bool = True) -> Union[bool, FutureResult[bool]]:
...
def set_style(self, style: str, *, blocking: bool = True) -> Union[bool, FutureResult[bool]]: ...

def set_style(self, style: str, *, blocking: bool = True) -> Union[bool, FutureResult[bool]]:
return self._engine.win_set_style(
Expand All @@ -539,20 +534,16 @@ def set_style(self, style: str, *, blocking: bool = True) -> Union[bool, FutureR
)

@overload
def set_ex_style(self, style: str) -> bool:
...
def set_ex_style(self, style: str) -> bool: ...

@overload
def set_ex_style(self, style: str, *, blocking: Literal[False]) -> FutureResult[bool]:
...
def set_ex_style(self, style: str, *, blocking: Literal[False]) -> FutureResult[bool]: ...

@overload
def set_ex_style(self, style: str, *, blocking: Literal[True]) -> bool:
...
def set_ex_style(self, style: str, *, blocking: Literal[True]) -> bool: ...

@overload
def set_ex_style(self, style: str, *, blocking: bool = True) -> Union[bool, FutureResult[bool]]:
...
def set_ex_style(self, style: str, *, blocking: bool = True) -> Union[bool, FutureResult[bool]]: ...

def set_ex_style(self, style: str, *, blocking: bool = True) -> Union[bool, FutureResult[bool]]:
return self._engine.win_set_ex_style(
Expand All @@ -564,20 +555,16 @@ def set_ex_style(self, style: str, *, blocking: bool = True) -> Union[bool, Futu
)

@overload
def set_region(self, options: str) -> bool:
...
def set_region(self, options: str) -> bool: ...

@overload
def set_region(self, options: str, *, blocking: Literal[True]) -> bool:
...
def set_region(self, options: str, *, blocking: Literal[True]) -> bool: ...

@overload
def set_region(self, options: str, *, blocking: Literal[False]) -> FutureResult[bool]:
...
def set_region(self, options: str, *, blocking: Literal[False]) -> FutureResult[bool]: ...

@overload
def set_region(self, options: str, *, blocking: bool = True) -> Union[bool, FutureResult[bool]]:
...
def set_region(self, options: str, *, blocking: bool = True) -> Union[bool, FutureResult[bool]]: ...

def set_region(self, options: str, *, blocking: bool = True) -> Union[bool, FutureResult[bool]]:
return self._engine.win_set_region(
Expand Down
3 changes: 0 additions & 3 deletions ahk/directives.py
View file
Open in desktop
@@ -1,6 +1,3 @@
"""
Contains directive classes
"""
from types import SimpleNamespace
from typing import Any
from typing import NoReturn
Expand Down
6 changes: 1 addition & 5 deletions ahk/keys.py
View file
Open in desktop
@@ -1,6 +1,3 @@
"""
The ahk.keys module contains some useful constants and classes for working with keys.
"""
from __future__ import annotations

from typing import Any
Expand Down Expand Up @@ -115,8 +112,7 @@ def __repr__(self) -> str:

@runtime_checkable
class Stringable(Protocol):
def __str__(self) -> str:
...
def __str__(self) -> str: ...


class KeyModifier(Key):
Expand Down
6 changes: 2 additions & 4 deletions ahk/message.py
View file
Open in desktop
Expand Up @@ -28,17 +28,15 @@
from typing import Union


class OutOfMessageTypes(Exception):
...
class OutOfMessageTypes(Exception): ...


Position = namedtuple('Position', ('x', 'y', 'width', 'height'))


@runtime_checkable
class BytesLineReadable(Protocol):
def readline(self) -> bytes:
...
def readline(self) -> bytes: ...


def is_window_control_list_response(resp_obj: object) -> TypeGuard[Tuple[str, List[Tuple[str, str]]]]:
Expand Down
2 changes: 1 addition & 1 deletion buildunasync.py
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@
'async_sleep': 'sleep',
'AsyncFutureResult': 'FutureResult',
'_async_run_nonblocking': '_sync_run_nonblocking',
'acommunicate': 'communicate'
'acommunicate': 'communicate',
# "__aenter__": "__aenter__",
},
),
Expand Down