From 996692752918fcb12b75ff65387e9e1d4be4e4f8 Mon Sep 17 00:00:00 2001 From: Quantum Date: Sat, 3 Oct 2020 01:43:58 -0400 Subject: [PATCH] Export Windows writers and parsers --- win2xcur/main/win2xcur.py | 3 ++- win2xcur/main/x2wincur.py | 2 +- win2xcur/parser/__init__.py | 2 ++ win2xcur/writer/__init__.py | 5 +++++ win2xcur/writer/windows.py | 3 +-- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/win2xcur/main/win2xcur.py b/win2xcur/main/win2xcur.py index b13958b..e50b644 100644 --- a/win2xcur/main/win2xcur.py +++ b/win2xcur/main/win2xcur.py @@ -9,7 +9,8 @@ from typing import BinaryIO from win2xcur import shadow from win2xcur.parser import open_blob -from win2xcur.writer.x11 import check_xcursorgen, to_x11 +from win2xcur.writer import to_x11 +from win2xcur.writer.x11 import check_xcursorgen def main() -> None: diff --git a/win2xcur/main/x2wincur.py b/win2xcur/main/x2wincur.py index 308d6d5..37e618a 100644 --- a/win2xcur/main/x2wincur.py +++ b/win2xcur/main/x2wincur.py @@ -8,7 +8,7 @@ from threading import Lock from typing import BinaryIO from win2xcur.parser import open_blob -from win2xcur.writer.windows import to_smart +from win2xcur.writer import to_smart def main() -> None: diff --git a/win2xcur/parser/__init__.py b/win2xcur/parser/__init__.py index 9bb18e0..0c78e30 100644 --- a/win2xcur/parser/__init__.py +++ b/win2xcur/parser/__init__.py @@ -5,6 +5,8 @@ from win2xcur.parser.base import BaseParser from win2xcur.parser.cur import CURParser from win2xcur.parser.xcursor import XCursorParser +__all__ = ['ANIParser', 'CURParser', 'XCursorParser', 'PARSERS', 'open_blob'] + PARSERS: List[Type[BaseParser]] = [CURParser, ANIParser, XCursorParser] diff --git a/win2xcur/writer/__init__.py b/win2xcur/writer/__init__.py index 30672b7..e1ecf40 100644 --- a/win2xcur/writer/__init__.py +++ b/win2xcur/writer/__init__.py @@ -1,5 +1,10 @@ +from win2xcur.writer.windows import to_ani, to_cur, to_smart from win2xcur.writer.x11 import to_x11 +__all__ = ['to_ani', 'to_cur', 'to_smart', 'to_x11'] + CONVERTERS = { 'x11': (to_x11, ''), + 'ani': (to_ani, '.ani'), + 'cur': (to_cur, '.cur'), } diff --git a/win2xcur/writer/windows.py b/win2xcur/writer/windows.py index 5bf325f..454a80f 100644 --- a/win2xcur/writer/windows.py +++ b/win2xcur/writer/windows.py @@ -3,8 +3,7 @@ from itertools import chain from typing import List, Tuple from win2xcur.cursor import CursorFrame -from win2xcur.parser.ani import ANIParser -from win2xcur.parser.cur import CURParser +from win2xcur.parser import ANIParser, CURParser def to_cur(frame: CursorFrame) -> bytes: