From 3c3c44029601e3c355457897d18d28826abbe6c5 Mon Sep 17 00:00:00 2001 From: chrys Date: Fri, 9 Mar 2018 15:28:07 +0100 Subject: [PATCH] Revert "Merge branch 'master' of github.com:chrys87/fenrir" This reverts commit 2ce5adba82a6ea407ad85a44f5f066ad8b1b541f, reversing changes made to bf807c25192c7d5314b9f1c4779ad1c151bf4262. --- docu/user.md | 2 +- docu/user.txt | 2 +- setup.py | 4 ++-- src/fenrir/brailleDriver/brlapiDriver.py | 4 ++-- src/fenrir/brailleDriver/dummyDriver.py | 4 ++-- src/fenrir/commands/command_template.py | 2 +- .../commands/add_word_to_spell_check.py | 4 ++-- .../commands/commands/attribute_cursor.py | 4 ++-- src/fenrir/commands/commands/bookmark_1.py | 6 +++--- src/fenrir/commands/commands/bookmark_10.py | 6 +++--- src/fenrir/commands/commands/bookmark_2.py | 6 +++--- src/fenrir/commands/commands/bookmark_3.py | 6 +++--- src/fenrir/commands/commands/bookmark_4.py | 6 +++--- src/fenrir/commands/commands/bookmark_5.py | 6 +++--- src/fenrir/commands/commands/bookmark_6.py | 6 +++--- src/fenrir/commands/commands/bookmark_7.py | 6 +++--- src/fenrir/commands/commands/bookmark_8.py | 6 +++--- src/fenrir/commands/commands/bookmark_9.py | 6 +++--- src/fenrir/commands/commands/braille_flush.py | 2 +- .../commands/commands/braille_pan_left.py | 2 +- .../commands/commands/braille_pan_right.py | 2 +- .../commands/braille_return_to_cursor.py | 2 +- .../commands/commands/clear_bookmark_1.py | 2 +- .../commands/commands/clear_bookmark_10.py | 2 +- .../commands/commands/clear_bookmark_2.py | 2 +- .../commands/commands/clear_bookmark_3.py | 2 +- .../commands/commands/clear_bookmark_4.py | 2 +- .../commands/commands/clear_bookmark_5.py | 2 +- .../commands/commands/clear_bookmark_6.py | 2 +- .../commands/commands/clear_bookmark_7.py | 2 +- .../commands/commands/clear_bookmark_8.py | 2 +- .../commands/commands/clear_bookmark_9.py | 2 +- .../commands/commands/clear_clipboard.py | 2 +- .../commands/clear_window_application.py | 2 +- .../commands/copy_marked_to_clipboard.py | 4 ++-- .../commands/commands/curr_clipboard.py | 2 +- src/fenrir/commands/commands/curr_screen.py | 2 +- .../commands/curr_screen_after_cursor.py | 4 ++-- .../commands/curr_screen_before_cursor.py | 4 ++-- src/fenrir/commands/commands/cursor_column.py | 2 +- src/fenrir/commands/commands/cursor_lineno.py | 2 +- .../commands/commands/cursor_position.py | 2 +- .../commands/cursor_read_to_end_of_line.py | 4 ++-- src/fenrir/commands/commands/date.py | 2 +- .../commands/commands/dec_alsa_volume.py | 2 +- .../commands/commands/dec_sound_volume.py | 2 +- .../commands/commands/dec_speech_pitch.py | 2 +- .../commands/commands/dec_speech_rate.py | 2 +- .../commands/commands/dec_speech_volume.py | 2 +- src/fenrir/commands/commands/exit_review.py | 2 +- .../commands/export_clipboard_to_file.py | 2 +- .../commands/export_clipboard_to_x.py | 2 +- .../commands/commands/first_clipboard.py | 2 +- .../commands/commands/forward_keypress.py | 2 +- .../commands/import_clipboard_from_file.py | 4 ++-- .../commands/commands/inc_alsa_volume.py | 2 +- .../commands/commands/inc_sound_volume.py | 2 +- .../commands/commands/inc_speech_pitch.py | 2 +- .../commands/commands/inc_speech_rate.py | 2 +- .../commands/commands/inc_speech_volume.py | 2 +- .../commands/commands/indent_curr_line.py | 4 ++-- .../commands/commands/last_clipboard.py | 2 +- src/fenrir/commands/commands/last_incoming.py | 2 +- src/fenrir/commands/commands/marked_text.py | 4 ++-- .../commands/commands/next_clipboard.py | 2 +- .../commands/commands/paste_clipboard.py | 2 +- .../commands/commands/present_first_line.py | 4 ++-- .../commands/commands/present_last_line.py | 4 ++-- .../commands/commands/prev_clipboard.py | 2 +- src/fenrir/commands/commands/quit_fenrir.py | 2 +- src/fenrir/commands/commands/remove_marks.py | 2 +- .../commands/remove_word_from_spell_check.py | 4 ++-- src/fenrir/commands/commands/review_bottom.py | 2 +- .../commands/commands/review_curr_char.py | 4 ++-- .../commands/review_curr_char_phonetic.py | 4 ++-- .../commands/commands/review_curr_line.py | 4 ++-- .../commands/commands/review_curr_word.py | 4 ++-- .../commands/review_curr_word_phonetic.py | 6 +++--- src/fenrir/commands/commands/review_down.py | 4 ++-- .../commands/commands/review_line_begin.py | 4 ++-- .../commands/commands/review_line_end.py | 4 ++-- .../commands/review_line_first_char.py | 6 +++--- .../commands/review_line_last_char.py | 4 ++-- .../commands/commands/review_next_char.py | 4 ++-- .../commands/review_next_char_phonetic.py | 4 ++-- .../commands/commands/review_next_line.py | 4 ++-- .../commands/commands/review_next_word.py | 4 ++-- .../commands/review_next_word_phonetic.py | 6 +++--- .../commands/commands/review_prev_char.py | 4 ++-- .../commands/review_prev_char_phonetic.py | 4 ++-- .../commands/commands/review_prev_line.py | 4 ++-- .../commands/commands/review_prev_word.py | 4 ++-- .../commands/review_prev_word_phonetic.py | 6 +++--- src/fenrir/commands/commands/review_top.py | 4 ++-- src/fenrir/commands/commands/review_up.py | 4 ++-- .../commands/commands/set_bookmark_1.py | 2 +- .../commands/commands/set_bookmark_10.py | 2 +- .../commands/commands/set_bookmark_2.py | 2 +- .../commands/commands/set_bookmark_3.py | 2 +- .../commands/commands/set_bookmark_4.py | 2 +- .../commands/commands/set_bookmark_5.py | 2 +- .../commands/commands/set_bookmark_6.py | 2 +- .../commands/commands/set_bookmark_7.py | 2 +- .../commands/commands/set_bookmark_8.py | 2 +- .../commands/commands/set_bookmark_9.py | 2 +- src/fenrir/commands/commands/set_mark.py | 2 +- .../commands/set_window_application.py | 2 +- src/fenrir/commands/commands/shut_up.py | 2 +- src/fenrir/commands/commands/spell_check.py | 4 ++-- src/fenrir/commands/commands/subprocess.py | 2 +- .../commands/commands/temp_disable_speech.py | 2 +- src/fenrir/commands/commands/time.py | 2 +- .../commands/commands/toggle_auto_read.py | 2 +- .../commands/toggle_auto_spell_check.py | 2 +- .../commands/commands/toggle_auto_time.py | 2 +- .../commands/commands/toggle_braille.py | 2 +- .../commands/commands/toggle_emoticons.py | 2 +- .../commands/toggle_highlight_tracking.py | 2 +- src/fenrir/commands/commands/toggle_output.py | 2 +- .../commands/toggle_punctuation_level.py | 2 +- src/fenrir/commands/commands/toggle_sound.py | 2 +- src/fenrir/commands/commands/toggle_speech.py | 2 +- .../commands/commands/toggle_tutorial_mode.py | 2 +- src/fenrir/commands/help/curr_help.py | 2 +- src/fenrir/commands/help/next_help.py | 2 +- src/fenrir/commands/help/prev_help.py | 2 +- .../onCursorChange/45000-char_echo.py | 2 +- ...resent_char_if_cursor_change_horizontal.py | 4 ++-- ...-present_line_if_cursor_change_vertical.py | 6 +++--- .../onCursorChange/60000-word_echo_type.py | 4 ++-- .../61000-word_echo_navigation.py | 4 ++-- .../onCursorChange/62000-spell_check.py | 4 ++-- .../onCursorChange/65000-char_delete_echo.py | 2 +- .../onCursorChange/66000-exit_review_mode.py | 2 +- .../onHeartBeat/2000-GetSessionInfo.py | 2 +- src/fenrir/commands/onHeartBeat/76000-time.py | 2 +- .../commands/onHeartBeat/deactive/1.echo.py | 2 +- src/fenrir/commands/onInput/10000-shut_up.py | 2 +- .../onInput/15000-enable_temp_speech.py | 2 +- src/fenrir/commands/onInput/80000-capslock.py | 2 +- .../commands/onInput/80300-scrolllock.py | 2 +- src/fenrir/commands/onInput/80500-numlock.py | 2 +- .../onPlugInputDevice/50000-UpdateDevices.py | 2 +- .../commands/onScreenChanged/10000-shut_up.py | 2 +- .../80000-screen_change_announcement.py | 2 +- .../onScreenChanged/85000-reset_marks.py | 2 +- .../89000-leave_review_mode.py | 2 +- .../56000-highlight_tracking.py | 2 +- .../commands/onScreenUpdate/60000-history.py | 2 +- .../commands/onScreenUpdate/70000-incoming.py | 2 +- .../onScreenUpdate/75000-incoming_promote.py | 2 +- .../onSwitchApplicationProfile/default.py | 2 +- .../inactive/agetty.py | 2 +- .../inactive/bash.py | 2 +- .../inactive/vim.py | 2 +- src/fenrir/commands/switchTrigger_template.py | 2 +- src/fenrir/core/applicationManager.py | 2 +- src/fenrir/core/brailleDriver.py | 2 +- src/fenrir/core/commandData.py | 2 +- src/fenrir/core/commandManager.py | 4 ++-- src/fenrir/core/cursorManager.py | 2 +- src/fenrir/core/debugManager.py | 2 +- src/fenrir/core/environment.py | 18 +++++++++--------- src/fenrir/core/eventData.py | 2 +- src/fenrir/core/eventManager.py | 4 ++-- src/fenrir/core/fenrirManager.py | 8 ++++---- src/fenrir/core/generalData.py | 2 +- src/fenrir/core/helpManager.py | 2 +- src/fenrir/core/inputData.py | 2 +- src/fenrir/core/inputManager.py | 2 +- src/fenrir/core/outputData.py | 2 +- src/fenrir/core/outputManager.py | 4 ++-- src/fenrir/core/processManager.py | 4 ++-- src/fenrir/core/punctuationData.py | 2 +- src/fenrir/core/punctuationManager.py | 2 +- src/fenrir/core/runtimeData.py | 2 +- src/fenrir/core/screenData.py | 2 +- src/fenrir/core/screenDriver.py | 2 +- src/fenrir/core/screenManager.py | 2 +- src/fenrir/core/settingsData.py | 2 +- src/fenrir/core/settingsManager.py | 19 ------------------- src/fenrir/core/soundDriver.py | 2 +- src/fenrir/core/speechDriver.py | 2 +- src/fenrir/fenrir | 2 +- src/fenrir/fenrir-daemon | 2 +- src/fenrir/inputDriver/dummyDriver.py | 4 ---- src/fenrir/inputDriver/evdevDriver.py | 6 ------ src/fenrir/screenDriver/vcsaDriver.py | 7 +------ src/fenrir/soundDriver/dummyDriver.py | 4 ---- src/fenrir/soundDriver/genericDriver.py | 2 +- src/fenrir/soundDriver/gstreamerDriver.py | 2 +- src/fenrir/speechDriver/dummyDriver.py | 4 ---- src/fenrir/speechDriver/emacspeakDriver.py | 4 ---- src/fenrir/speechDriver/espeakDriver.py | 4 ---- src/fenrir/speechDriver/genericDriver.py | 2 +- src/fenrir/speechDriver/speechdDriver.py | 4 ---- src/fenrir/utils/char_utils.py | 2 +- src/fenrir/utils/line_utils.py | 2 +- src/fenrir/utils/mark_utils.py | 2 +- src/fenrir/utils/review_utils.py | 2 +- src/fenrir/utils/screen_utils.py | 2 +- src/fenrir/utils/word_utils.py | 2 +- 202 files changed, 277 insertions(+), 331 deletions(-) diff --git a/docu/user.md b/docu/user.md index fe99f318..60917166 100644 --- a/docu/user.md +++ b/docu/user.md @@ -1517,7 +1517,7 @@ Commands are python files with a special scheme. You can assign them to a shortc Good Examples: ["date.py"](https///github.com/chrys87/fenrir/blob/master/src/fenrir/commands/commands/date.py) (announce the Date), ["shut_up.py"](https///github.com/chrys87/fenrir/blob/master/src/fenrir/commands/commands/shut_up.py) (interrupt output) the basic scheme for a command is as follows: - from fenrir.core import debug + from core import debug class command(): def __init__(self): diff --git a/docu/user.txt b/docu/user.txt index c88d9524..5c8e1c60 100644 --- a/docu/user.txt +++ b/docu/user.txt @@ -1273,7 +1273,7 @@ Commands are python files with a special scheme. You can assign them to a shortc Good Examples: [[https://github.com/chrys87/fenrir/blob/master/src/fenrir/commands/commands/date.py|"date.py"]] (announce the Date), [[https://github.com/chrys87/fenrir/blob/master/src/fenrir/commands/commands/shut_up.py|"shut_up.py"]] (interrupt output) the basic scheme for a command is as follows: - from fenrir.core import debug + from core import debug class command(): def __init__(self): diff --git a/setup.py b/setup.py index 6bc3b470..ee28bf24 100755 --- a/setup.py +++ b/setup.py @@ -78,8 +78,8 @@ setup( author_email="chrysg@linux-a11y.org", # Packages - packages=find_packages('src'), - package_dir={'': 'src'}, + packages=find_packages('src/fenrir'), + package_dir={'': 'src/fenrir'}, scripts=['src/fenrir/fenrir','src/fenrir/fenrir-daemon'], # Include additional files into the package diff --git a/src/fenrir/brailleDriver/brlapiDriver.py b/src/fenrir/brailleDriver/brlapiDriver.py index 66de4179..f7e63b83 100644 --- a/src/fenrir/brailleDriver/brlapiDriver.py +++ b/src/fenrir/brailleDriver/brlapiDriver.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.core.brailleDriver import brailleDriver +from core import debug +from core.brailleDriver import brailleDriver class driver(brailleDriver): def __init__(self): diff --git a/src/fenrir/brailleDriver/dummyDriver.py b/src/fenrir/brailleDriver/dummyDriver.py index cc88d6ee..be13dd4d 100644 --- a/src/fenrir/brailleDriver/dummyDriver.py +++ b/src/fenrir/brailleDriver/dummyDriver.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.core.brailleDriver import brailleDriver +from core import debug +from core.brailleDriver import brailleDriver class driver(brailleDriver): def __init__(self): diff --git a/src/fenrir/commands/command_template.py b/src/fenrir/commands/command_template.py index 843b9a4e..25b6b1a8 100644 --- a/src/fenrir/commands/command_template.py +++ b/src/fenrir/commands/command_template.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/add_word_to_spell_check.py b/src/fenrir/commands/commands/add_word_to_spell_check.py index 7c26fc3a..2eb5c579 100644 --- a/src/fenrir/commands/commands/add_word_to_spell_check.py +++ b/src/fenrir/commands/commands/add_word_to_spell_check.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import word_utils +from core import debug +from utils import word_utils import string initialized = False try: diff --git a/src/fenrir/commands/commands/attribute_cursor.py b/src/fenrir/commands/commands/attribute_cursor.py index 815c269c..86285b1f 100644 --- a/src/fenrir/commands/commands/attribute_cursor.py +++ b/src/fenrir/commands/commands/attribute_cursor.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import screen_utils +from core import debug +from utils import screen_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/bookmark_1.py b/src/fenrir/commands/commands/bookmark_1.py index d1520bac..28923622 100644 --- a/src/fenrir/commands/commands/bookmark_1.py +++ b/src/fenrir/commands/commands/bookmark_1.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import mark_utils -from fenrir.utils import line_utils +from core import debug +from utils import mark_utils +from utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/bookmark_10.py b/src/fenrir/commands/commands/bookmark_10.py index 03e01825..d85dcf27 100644 --- a/src/fenrir/commands/commands/bookmark_10.py +++ b/src/fenrir/commands/commands/bookmark_10.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import mark_utils -from fenrir.utils import line_utils +from core import debug +from utils import mark_utils +from utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/bookmark_2.py b/src/fenrir/commands/commands/bookmark_2.py index a087d4d3..e25c59c2 100644 --- a/src/fenrir/commands/commands/bookmark_2.py +++ b/src/fenrir/commands/commands/bookmark_2.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import mark_utils -from fenrir.utils import line_utils +from core import debug +from utils import mark_utils +from utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/bookmark_3.py b/src/fenrir/commands/commands/bookmark_3.py index 418851e1..490e49b7 100644 --- a/src/fenrir/commands/commands/bookmark_3.py +++ b/src/fenrir/commands/commands/bookmark_3.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import mark_utils -from fenrir.utils import line_utils +from core import debug +from utils import mark_utils +from utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/bookmark_4.py b/src/fenrir/commands/commands/bookmark_4.py index 4e3889a3..09543ea6 100644 --- a/src/fenrir/commands/commands/bookmark_4.py +++ b/src/fenrir/commands/commands/bookmark_4.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import mark_utils -from fenrir.utils import line_utils +from core import debug +from utils import mark_utils +from utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/bookmark_5.py b/src/fenrir/commands/commands/bookmark_5.py index ac6d531a..4df87ac9 100644 --- a/src/fenrir/commands/commands/bookmark_5.py +++ b/src/fenrir/commands/commands/bookmark_5.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import mark_utils -from fenrir.utils import line_utils +from core import debug +from utils import mark_utils +from utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/bookmark_6.py b/src/fenrir/commands/commands/bookmark_6.py index 14e43716..0073e40a 100644 --- a/src/fenrir/commands/commands/bookmark_6.py +++ b/src/fenrir/commands/commands/bookmark_6.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import mark_utils -from fenrir.utils import line_utils +from core import debug +from utils import mark_utils +from utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/bookmark_7.py b/src/fenrir/commands/commands/bookmark_7.py index 2e607dfb..8275698d 100644 --- a/src/fenrir/commands/commands/bookmark_7.py +++ b/src/fenrir/commands/commands/bookmark_7.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import mark_utils -from fenrir.utils import line_utils +from core import debug +from utils import mark_utils +from utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/bookmark_8.py b/src/fenrir/commands/commands/bookmark_8.py index 136c112e..6a5f2e42 100644 --- a/src/fenrir/commands/commands/bookmark_8.py +++ b/src/fenrir/commands/commands/bookmark_8.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import mark_utils -from fenrir.utils import line_utils +from core import debug +from utils import mark_utils +from utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/bookmark_9.py b/src/fenrir/commands/commands/bookmark_9.py index e57b2ae2..a86fcd1c 100644 --- a/src/fenrir/commands/commands/bookmark_9.py +++ b/src/fenrir/commands/commands/bookmark_9.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import mark_utils -from fenrir.utils import line_utils +from core import debug +from utils import mark_utils +from utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/braille_flush.py b/src/fenrir/commands/commands/braille_flush.py index f55f03b0..3c0ece33 100644 --- a/src/fenrir/commands/commands/braille_flush.py +++ b/src/fenrir/commands/commands/braille_flush.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/braille_pan_left.py b/src/fenrir/commands/commands/braille_pan_left.py index ed16ed49..284dacc7 100644 --- a/src/fenrir/commands/commands/braille_pan_left.py +++ b/src/fenrir/commands/commands/braille_pan_left.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/braille_pan_right.py b/src/fenrir/commands/commands/braille_pan_right.py index 9326b014..c0272fba 100644 --- a/src/fenrir/commands/commands/braille_pan_right.py +++ b/src/fenrir/commands/commands/braille_pan_right.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/braille_return_to_cursor.py b/src/fenrir/commands/commands/braille_return_to_cursor.py index 3ccfa8e1..01cecbbe 100644 --- a/src/fenrir/commands/commands/braille_return_to_cursor.py +++ b/src/fenrir/commands/commands/braille_return_to_cursor.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/clear_bookmark_1.py b/src/fenrir/commands/commands/clear_bookmark_1.py index cbae7230..d543a97e 100644 --- a/src/fenrir/commands/commands/clear_bookmark_1.py +++ b/src/fenrir/commands/commands/clear_bookmark_1.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/clear_bookmark_10.py b/src/fenrir/commands/commands/clear_bookmark_10.py index 56728378..5e77a224 100644 --- a/src/fenrir/commands/commands/clear_bookmark_10.py +++ b/src/fenrir/commands/commands/clear_bookmark_10.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/clear_bookmark_2.py b/src/fenrir/commands/commands/clear_bookmark_2.py index 611f6875..baa3daea 100644 --- a/src/fenrir/commands/commands/clear_bookmark_2.py +++ b/src/fenrir/commands/commands/clear_bookmark_2.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/clear_bookmark_3.py b/src/fenrir/commands/commands/clear_bookmark_3.py index c368347e..924ed7d7 100644 --- a/src/fenrir/commands/commands/clear_bookmark_3.py +++ b/src/fenrir/commands/commands/clear_bookmark_3.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/clear_bookmark_4.py b/src/fenrir/commands/commands/clear_bookmark_4.py index cb624581..781d8aa0 100644 --- a/src/fenrir/commands/commands/clear_bookmark_4.py +++ b/src/fenrir/commands/commands/clear_bookmark_4.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/clear_bookmark_5.py b/src/fenrir/commands/commands/clear_bookmark_5.py index 4733c59e..54a06923 100644 --- a/src/fenrir/commands/commands/clear_bookmark_5.py +++ b/src/fenrir/commands/commands/clear_bookmark_5.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/clear_bookmark_6.py b/src/fenrir/commands/commands/clear_bookmark_6.py index 1c4e4adf..a79267fc 100644 --- a/src/fenrir/commands/commands/clear_bookmark_6.py +++ b/src/fenrir/commands/commands/clear_bookmark_6.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/clear_bookmark_7.py b/src/fenrir/commands/commands/clear_bookmark_7.py index 7392b9c0..39cb1435 100644 --- a/src/fenrir/commands/commands/clear_bookmark_7.py +++ b/src/fenrir/commands/commands/clear_bookmark_7.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/clear_bookmark_8.py b/src/fenrir/commands/commands/clear_bookmark_8.py index d8b5c0e1..b5e22414 100644 --- a/src/fenrir/commands/commands/clear_bookmark_8.py +++ b/src/fenrir/commands/commands/clear_bookmark_8.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/clear_bookmark_9.py b/src/fenrir/commands/commands/clear_bookmark_9.py index f71e79c3..a9fd30a4 100644 --- a/src/fenrir/commands/commands/clear_bookmark_9.py +++ b/src/fenrir/commands/commands/clear_bookmark_9.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/clear_clipboard.py b/src/fenrir/commands/commands/clear_clipboard.py index 38fbfcdc..781e6acf 100644 --- a/src/fenrir/commands/commands/clear_clipboard.py +++ b/src/fenrir/commands/commands/clear_clipboard.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/clear_window_application.py b/src/fenrir/commands/commands/clear_window_application.py index 761281ae..11af3045 100644 --- a/src/fenrir/commands/commands/clear_window_application.py +++ b/src/fenrir/commands/commands/clear_window_application.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/copy_marked_to_clipboard.py b/src/fenrir/commands/commands/copy_marked_to_clipboard.py index 6da0fced..c83fdeb0 100644 --- a/src/fenrir/commands/commands/copy_marked_to_clipboard.py +++ b/src/fenrir/commands/commands/copy_marked_to_clipboard.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import mark_utils +from core import debug +from utils import mark_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/curr_clipboard.py b/src/fenrir/commands/commands/curr_clipboard.py index 4aa81beb..9c2baf3e 100644 --- a/src/fenrir/commands/commands/curr_clipboard.py +++ b/src/fenrir/commands/commands/curr_clipboard.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/curr_screen.py b/src/fenrir/commands/commands/curr_screen.py index 99f1a9e0..2de39736 100644 --- a/src/fenrir/commands/commands/curr_screen.py +++ b/src/fenrir/commands/commands/curr_screen.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/curr_screen_after_cursor.py b/src/fenrir/commands/commands/curr_screen_after_cursor.py index 3b13e96b..1e059cc9 100644 --- a/src/fenrir/commands/commands/curr_screen_after_cursor.py +++ b/src/fenrir/commands/commands/curr_screen_after_cursor.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import mark_utils +from core import debug +from utils import mark_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/curr_screen_before_cursor.py b/src/fenrir/commands/commands/curr_screen_before_cursor.py index f29a9a81..8fd0a851 100644 --- a/src/fenrir/commands/commands/curr_screen_before_cursor.py +++ b/src/fenrir/commands/commands/curr_screen_before_cursor.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import mark_utils +from core import debug +from utils import mark_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/cursor_column.py b/src/fenrir/commands/commands/cursor_column.py index f9819e79..d3c119a6 100644 --- a/src/fenrir/commands/commands/cursor_column.py +++ b/src/fenrir/commands/commands/cursor_column.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/cursor_lineno.py b/src/fenrir/commands/commands/cursor_lineno.py index d0d9641e..a8b39ce6 100644 --- a/src/fenrir/commands/commands/cursor_lineno.py +++ b/src/fenrir/commands/commands/cursor_lineno.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/cursor_position.py b/src/fenrir/commands/commands/cursor_position.py index f05ecbc1..99b13fab 100644 --- a/src/fenrir/commands/commands/cursor_position.py +++ b/src/fenrir/commands/commands/cursor_position.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/cursor_read_to_end_of_line.py b/src/fenrir/commands/commands/cursor_read_to_end_of_line.py index 4aa959d6..93e8a8a0 100644 --- a/src/fenrir/commands/commands/cursor_read_to_end_of_line.py +++ b/src/fenrir/commands/commands/cursor_read_to_end_of_line.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import line_utils +from core import debug +from utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/date.py b/src/fenrir/commands/commands/date.py index 9b086110..39fc28ef 100644 --- a/src/fenrir/commands/commands/date.py +++ b/src/fenrir/commands/commands/date.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug import datetime class command(): diff --git a/src/fenrir/commands/commands/dec_alsa_volume.py b/src/fenrir/commands/commands/dec_alsa_volume.py index 230d0ca2..cd2aee07 100644 --- a/src/fenrir/commands/commands/dec_alsa_volume.py +++ b/src/fenrir/commands/commands/dec_alsa_volume.py @@ -11,7 +11,7 @@ try: except: pass -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/dec_sound_volume.py b/src/fenrir/commands/commands/dec_sound_volume.py index b80e4fde..c97414ce 100644 --- a/src/fenrir/commands/commands/dec_sound_volume.py +++ b/src/fenrir/commands/commands/dec_sound_volume.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug import math class command(): diff --git a/src/fenrir/commands/commands/dec_speech_pitch.py b/src/fenrir/commands/commands/dec_speech_pitch.py index 4a2bb87a..09e53b7c 100644 --- a/src/fenrir/commands/commands/dec_speech_pitch.py +++ b/src/fenrir/commands/commands/dec_speech_pitch.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug import math class command(): diff --git a/src/fenrir/commands/commands/dec_speech_rate.py b/src/fenrir/commands/commands/dec_speech_rate.py index 054f5cfe..a0248662 100644 --- a/src/fenrir/commands/commands/dec_speech_rate.py +++ b/src/fenrir/commands/commands/dec_speech_rate.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug import math class command(): diff --git a/src/fenrir/commands/commands/dec_speech_volume.py b/src/fenrir/commands/commands/dec_speech_volume.py index 279897aa..946803cb 100644 --- a/src/fenrir/commands/commands/dec_speech_volume.py +++ b/src/fenrir/commands/commands/dec_speech_volume.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug import math class command(): diff --git a/src/fenrir/commands/commands/exit_review.py b/src/fenrir/commands/commands/exit_review.py index a0fa424c..9c0369c4 100644 --- a/src/fenrir/commands/commands/exit_review.py +++ b/src/fenrir/commands/commands/exit_review.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/export_clipboard_to_file.py b/src/fenrir/commands/commands/export_clipboard_to_file.py index be25c936..0e1078ac 100644 --- a/src/fenrir/commands/commands/export_clipboard_to_file.py +++ b/src/fenrir/commands/commands/export_clipboard_to_file.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug import os class command(): diff --git a/src/fenrir/commands/commands/export_clipboard_to_x.py b/src/fenrir/commands/commands/export_clipboard_to_x.py index c6245d14..25175c1f 100644 --- a/src/fenrir/commands/commands/export_clipboard_to_x.py +++ b/src/fenrir/commands/commands/export_clipboard_to_x.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug import subprocess, os from subprocess import Popen, PIPE import _thread diff --git a/src/fenrir/commands/commands/first_clipboard.py b/src/fenrir/commands/commands/first_clipboard.py index 7deb4977..a4d98c87 100644 --- a/src/fenrir/commands/commands/first_clipboard.py +++ b/src/fenrir/commands/commands/first_clipboard.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/forward_keypress.py b/src/fenrir/commands/commands/forward_keypress.py index d5ba035f..c3e718fe 100644 --- a/src/fenrir/commands/commands/forward_keypress.py +++ b/src/fenrir/commands/commands/forward_keypress.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/import_clipboard_from_file.py b/src/fenrir/commands/commands/import_clipboard_from_file.py index 50e7e807..67b4f398 100644 --- a/src/fenrir/commands/commands/import_clipboard_from_file.py +++ b/src/fenrir/commands/commands/import_clipboard_from_file.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import mark_utils +from core import debug +from utils import mark_utils import os class command(): diff --git a/src/fenrir/commands/commands/inc_alsa_volume.py b/src/fenrir/commands/commands/inc_alsa_volume.py index dce3c80c..51f38c79 100644 --- a/src/fenrir/commands/commands/inc_alsa_volume.py +++ b/src/fenrir/commands/commands/inc_alsa_volume.py @@ -11,7 +11,7 @@ try: except: pass -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/inc_sound_volume.py b/src/fenrir/commands/commands/inc_sound_volume.py index 8bfc1351..78eee847 100644 --- a/src/fenrir/commands/commands/inc_sound_volume.py +++ b/src/fenrir/commands/commands/inc_sound_volume.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug import math class command(): diff --git a/src/fenrir/commands/commands/inc_speech_pitch.py b/src/fenrir/commands/commands/inc_speech_pitch.py index f298369f..cb267b66 100644 --- a/src/fenrir/commands/commands/inc_speech_pitch.py +++ b/src/fenrir/commands/commands/inc_speech_pitch.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug import math class command(): diff --git a/src/fenrir/commands/commands/inc_speech_rate.py b/src/fenrir/commands/commands/inc_speech_rate.py index a517c588..4db1763d 100644 --- a/src/fenrir/commands/commands/inc_speech_rate.py +++ b/src/fenrir/commands/commands/inc_speech_rate.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug import math class command(): diff --git a/src/fenrir/commands/commands/inc_speech_volume.py b/src/fenrir/commands/commands/inc_speech_volume.py index 331d66a3..1c6716e6 100644 --- a/src/fenrir/commands/commands/inc_speech_volume.py +++ b/src/fenrir/commands/commands/inc_speech_volume.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug import math class command(): diff --git a/src/fenrir/commands/commands/indent_curr_line.py b/src/fenrir/commands/commands/indent_curr_line.py index 45838dc1..09907691 100644 --- a/src/fenrir/commands/commands/indent_curr_line.py +++ b/src/fenrir/commands/commands/indent_curr_line.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import line_utils +from core import debug +from utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/last_clipboard.py b/src/fenrir/commands/commands/last_clipboard.py index 6ee360bf..2cf2f0bd 100644 --- a/src/fenrir/commands/commands/last_clipboard.py +++ b/src/fenrir/commands/commands/last_clipboard.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/last_incoming.py b/src/fenrir/commands/commands/last_incoming.py index 7e75af46..effb7f37 100644 --- a/src/fenrir/commands/commands/last_incoming.py +++ b/src/fenrir/commands/commands/last_incoming.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/marked_text.py b/src/fenrir/commands/commands/marked_text.py index 07ccccdb..9341382a 100644 --- a/src/fenrir/commands/commands/marked_text.py +++ b/src/fenrir/commands/commands/marked_text.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import mark_utils +from core import debug +from utils import mark_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/next_clipboard.py b/src/fenrir/commands/commands/next_clipboard.py index 79bf3325..01d5607a 100644 --- a/src/fenrir/commands/commands/next_clipboard.py +++ b/src/fenrir/commands/commands/next_clipboard.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/paste_clipboard.py b/src/fenrir/commands/commands/paste_clipboard.py index fe3e696d..1223a54b 100644 --- a/src/fenrir/commands/commands/paste_clipboard.py +++ b/src/fenrir/commands/commands/paste_clipboard.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug import time class command(): diff --git a/src/fenrir/commands/commands/present_first_line.py b/src/fenrir/commands/commands/present_first_line.py index f42b4823..9d54e879 100644 --- a/src/fenrir/commands/commands/present_first_line.py +++ b/src/fenrir/commands/commands/present_first_line.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import line_utils +from core import debug +from utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/present_last_line.py b/src/fenrir/commands/commands/present_last_line.py index 938ee928..25316f4c 100644 --- a/src/fenrir/commands/commands/present_last_line.py +++ b/src/fenrir/commands/commands/present_last_line.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import line_utils +from core import debug +from utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/prev_clipboard.py b/src/fenrir/commands/commands/prev_clipboard.py index cd676869..9fa6c575 100644 --- a/src/fenrir/commands/commands/prev_clipboard.py +++ b/src/fenrir/commands/commands/prev_clipboard.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/quit_fenrir.py b/src/fenrir/commands/commands/quit_fenrir.py index 2530de04..ea633658 100644 --- a/src/fenrir/commands/commands/quit_fenrir.py +++ b/src/fenrir/commands/commands/quit_fenrir.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/remove_marks.py b/src/fenrir/commands/commands/remove_marks.py index 9e956aed..0c2547e4 100644 --- a/src/fenrir/commands/commands/remove_marks.py +++ b/src/fenrir/commands/commands/remove_marks.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/remove_word_from_spell_check.py b/src/fenrir/commands/commands/remove_word_from_spell_check.py index 18c142d9..f212ee27 100644 --- a/src/fenrir/commands/commands/remove_word_from_spell_check.py +++ b/src/fenrir/commands/commands/remove_word_from_spell_check.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import word_utils +from core import debug +from utils import word_utils import string initialized = False try: diff --git a/src/fenrir/commands/commands/review_bottom.py b/src/fenrir/commands/commands/review_bottom.py index 1d594674..07a431f4 100644 --- a/src/fenrir/commands/commands/review_bottom.py +++ b/src/fenrir/commands/commands/review_bottom.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_curr_char.py b/src/fenrir/commands/commands/review_curr_char.py index 95f2845c..6784ba5f 100644 --- a/src/fenrir/commands/commands/review_curr_char.py +++ b/src/fenrir/commands/commands/review_curr_char.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import char_utils +from core import debug +from utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_curr_char_phonetic.py b/src/fenrir/commands/commands/review_curr_char_phonetic.py index 92a27eaf..061eec43 100644 --- a/src/fenrir/commands/commands/review_curr_char_phonetic.py +++ b/src/fenrir/commands/commands/review_curr_char_phonetic.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import char_utils +from core import debug +from utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_curr_line.py b/src/fenrir/commands/commands/review_curr_line.py index 58eafabf..af1de983 100644 --- a/src/fenrir/commands/commands/review_curr_line.py +++ b/src/fenrir/commands/commands/review_curr_line.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import line_utils +from core import debug +from utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_curr_word.py b/src/fenrir/commands/commands/review_curr_word.py index e10eea38..4436cd03 100644 --- a/src/fenrir/commands/commands/review_curr_word.py +++ b/src/fenrir/commands/commands/review_curr_word.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import word_utils +from core import debug +from utils import word_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_curr_word_phonetic.py b/src/fenrir/commands/commands/review_curr_word_phonetic.py index 2a2e16f8..c58568cb 100644 --- a/src/fenrir/commands/commands/review_curr_word_phonetic.py +++ b/src/fenrir/commands/commands/review_curr_word_phonetic.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import word_utils -from fenrir.utils import char_utils +from core import debug +from utils import word_utils +from utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_down.py b/src/fenrir/commands/commands/review_down.py index f529483c..2428083e 100644 --- a/src/fenrir/commands/commands/review_down.py +++ b/src/fenrir/commands/commands/review_down.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import char_utils +from core import debug +from utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_line_begin.py b/src/fenrir/commands/commands/review_line_begin.py index c3e10772..c788a5ca 100644 --- a/src/fenrir/commands/commands/review_line_begin.py +++ b/src/fenrir/commands/commands/review_line_begin.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import char_utils +from core import debug +from utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_line_end.py b/src/fenrir/commands/commands/review_line_end.py index 8a566ce1..1af5b558 100644 --- a/src/fenrir/commands/commands/review_line_end.py +++ b/src/fenrir/commands/commands/review_line_end.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import char_utils +from core import debug +from utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_line_first_char.py b/src/fenrir/commands/commands/review_line_first_char.py index 73ab8457..82f687a8 100644 --- a/src/fenrir/commands/commands/review_line_first_char.py +++ b/src/fenrir/commands/commands/review_line_first_char.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import line_utils -from fenrir.utils import char_utils +from core import debug +from utils import line_utils +from utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_line_last_char.py b/src/fenrir/commands/commands/review_line_last_char.py index 8dd388eb..f30265ee 100644 --- a/src/fenrir/commands/commands/review_line_last_char.py +++ b/src/fenrir/commands/commands/review_line_last_char.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import char_utils +from core import debug +from utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_next_char.py b/src/fenrir/commands/commands/review_next_char.py index 65664c46..e3c0a2ee 100644 --- a/src/fenrir/commands/commands/review_next_char.py +++ b/src/fenrir/commands/commands/review_next_char.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import char_utils +from core import debug +from utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_next_char_phonetic.py b/src/fenrir/commands/commands/review_next_char_phonetic.py index 0639df3f..f4ae4aa3 100644 --- a/src/fenrir/commands/commands/review_next_char_phonetic.py +++ b/src/fenrir/commands/commands/review_next_char_phonetic.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import char_utils +from core import debug +from utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_next_line.py b/src/fenrir/commands/commands/review_next_line.py index 348cfc00..a41550c1 100644 --- a/src/fenrir/commands/commands/review_next_line.py +++ b/src/fenrir/commands/commands/review_next_line.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import line_utils +from core import debug +from utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_next_word.py b/src/fenrir/commands/commands/review_next_word.py index 4018f79f..c05ca59a 100644 --- a/src/fenrir/commands/commands/review_next_word.py +++ b/src/fenrir/commands/commands/review_next_word.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import word_utils +from core import debug +from utils import word_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_next_word_phonetic.py b/src/fenrir/commands/commands/review_next_word_phonetic.py index 8475b941..f0e9f90e 100644 --- a/src/fenrir/commands/commands/review_next_word_phonetic.py +++ b/src/fenrir/commands/commands/review_next_word_phonetic.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import word_utils -from fenrir.utils import char_utils +from core import debug +from utils import word_utils +from utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_prev_char.py b/src/fenrir/commands/commands/review_prev_char.py index a6690c88..444eb32a 100644 --- a/src/fenrir/commands/commands/review_prev_char.py +++ b/src/fenrir/commands/commands/review_prev_char.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import char_utils +from core import debug +from utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_prev_char_phonetic.py b/src/fenrir/commands/commands/review_prev_char_phonetic.py index 5fc60fd1..e66e0883 100644 --- a/src/fenrir/commands/commands/review_prev_char_phonetic.py +++ b/src/fenrir/commands/commands/review_prev_char_phonetic.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import char_utils +from core import debug +from utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_prev_line.py b/src/fenrir/commands/commands/review_prev_line.py index 1ff6a39d..c3601955 100644 --- a/src/fenrir/commands/commands/review_prev_line.py +++ b/src/fenrir/commands/commands/review_prev_line.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import line_utils +from core import debug +from utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_prev_word.py b/src/fenrir/commands/commands/review_prev_word.py index f6549122..b36f3038 100644 --- a/src/fenrir/commands/commands/review_prev_word.py +++ b/src/fenrir/commands/commands/review_prev_word.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import word_utils +from core import debug +from utils import word_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_prev_word_phonetic.py b/src/fenrir/commands/commands/review_prev_word_phonetic.py index a5d518b2..eeddfd3e 100644 --- a/src/fenrir/commands/commands/review_prev_word_phonetic.py +++ b/src/fenrir/commands/commands/review_prev_word_phonetic.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import word_utils -from fenrir.utils import char_utils +from core import debug +from utils import word_utils +from utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_top.py b/src/fenrir/commands/commands/review_top.py index 45c40415..aaaed438 100644 --- a/src/fenrir/commands/commands/review_top.py +++ b/src/fenrir/commands/commands/review_top.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import char_utils +from core import debug +from utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_up.py b/src/fenrir/commands/commands/review_up.py index 505935f2..1867e878 100644 --- a/src/fenrir/commands/commands/review_up.py +++ b/src/fenrir/commands/commands/review_up.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import char_utils +from core import debug +from utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/set_bookmark_1.py b/src/fenrir/commands/commands/set_bookmark_1.py index 54c754d4..6a59ec79 100644 --- a/src/fenrir/commands/commands/set_bookmark_1.py +++ b/src/fenrir/commands/commands/set_bookmark_1.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/set_bookmark_10.py b/src/fenrir/commands/commands/set_bookmark_10.py index ebfcdfa3..4a565c2f 100644 --- a/src/fenrir/commands/commands/set_bookmark_10.py +++ b/src/fenrir/commands/commands/set_bookmark_10.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/set_bookmark_2.py b/src/fenrir/commands/commands/set_bookmark_2.py index 5540c10a..26d02637 100644 --- a/src/fenrir/commands/commands/set_bookmark_2.py +++ b/src/fenrir/commands/commands/set_bookmark_2.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/set_bookmark_3.py b/src/fenrir/commands/commands/set_bookmark_3.py index 1efdcf42..8645ee3c 100644 --- a/src/fenrir/commands/commands/set_bookmark_3.py +++ b/src/fenrir/commands/commands/set_bookmark_3.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/set_bookmark_4.py b/src/fenrir/commands/commands/set_bookmark_4.py index bc77c920..b098a50d 100644 --- a/src/fenrir/commands/commands/set_bookmark_4.py +++ b/src/fenrir/commands/commands/set_bookmark_4.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/set_bookmark_5.py b/src/fenrir/commands/commands/set_bookmark_5.py index fd96a265..6c082f91 100644 --- a/src/fenrir/commands/commands/set_bookmark_5.py +++ b/src/fenrir/commands/commands/set_bookmark_5.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/set_bookmark_6.py b/src/fenrir/commands/commands/set_bookmark_6.py index f89bf9ce..a309d089 100644 --- a/src/fenrir/commands/commands/set_bookmark_6.py +++ b/src/fenrir/commands/commands/set_bookmark_6.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/set_bookmark_7.py b/src/fenrir/commands/commands/set_bookmark_7.py index 742cd342..4803487f 100644 --- a/src/fenrir/commands/commands/set_bookmark_7.py +++ b/src/fenrir/commands/commands/set_bookmark_7.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/set_bookmark_8.py b/src/fenrir/commands/commands/set_bookmark_8.py index cd1e8c7e..362f61c9 100644 --- a/src/fenrir/commands/commands/set_bookmark_8.py +++ b/src/fenrir/commands/commands/set_bookmark_8.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/set_bookmark_9.py b/src/fenrir/commands/commands/set_bookmark_9.py index b9119ae8..ef53c390 100644 --- a/src/fenrir/commands/commands/set_bookmark_9.py +++ b/src/fenrir/commands/commands/set_bookmark_9.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/set_mark.py b/src/fenrir/commands/commands/set_mark.py index 291c2248..82e1f90c 100644 --- a/src/fenrir/commands/commands/set_mark.py +++ b/src/fenrir/commands/commands/set_mark.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/set_window_application.py b/src/fenrir/commands/commands/set_window_application.py index fe193b78..9413fcd5 100644 --- a/src/fenrir/commands/commands/set_window_application.py +++ b/src/fenrir/commands/commands/set_window_application.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/shut_up.py b/src/fenrir/commands/commands/shut_up.py index ba1fa52c..aad7226b 100644 --- a/src/fenrir/commands/commands/shut_up.py +++ b/src/fenrir/commands/commands/shut_up.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/spell_check.py b/src/fenrir/commands/commands/spell_check.py index 8ad3de8d..c251ca02 100644 --- a/src/fenrir/commands/commands/spell_check.py +++ b/src/fenrir/commands/commands/spell_check.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import word_utils +from core import debug +from utils import word_utils initialized = False try: import enchant diff --git a/src/fenrir/commands/commands/subprocess.py b/src/fenrir/commands/commands/subprocess.py index a075e4cd..ac53e8d8 100644 --- a/src/fenrir/commands/commands/subprocess.py +++ b/src/fenrir/commands/commands/subprocess.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug import subprocess, os from subprocess import Popen, PIPE import _thread diff --git a/src/fenrir/commands/commands/temp_disable_speech.py b/src/fenrir/commands/commands/temp_disable_speech.py index 2f5d6305..c560e780 100644 --- a/src/fenrir/commands/commands/temp_disable_speech.py +++ b/src/fenrir/commands/commands/temp_disable_speech.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/time.py b/src/fenrir/commands/commands/time.py index 1425441e..4c6aa9d8 100644 --- a/src/fenrir/commands/commands/time.py +++ b/src/fenrir/commands/commands/time.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug import datetime class command(): diff --git a/src/fenrir/commands/commands/toggle_auto_read.py b/src/fenrir/commands/commands/toggle_auto_read.py index b28fe786..d60e9da8 100644 --- a/src/fenrir/commands/commands/toggle_auto_read.py +++ b/src/fenrir/commands/commands/toggle_auto_read.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): pass diff --git a/src/fenrir/commands/commands/toggle_auto_spell_check.py b/src/fenrir/commands/commands/toggle_auto_spell_check.py index 86779142..19d1e06d 100644 --- a/src/fenrir/commands/commands/toggle_auto_spell_check.py +++ b/src/fenrir/commands/commands/toggle_auto_spell_check.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/toggle_auto_time.py b/src/fenrir/commands/commands/toggle_auto_time.py index 477334ce..831cca44 100644 --- a/src/fenrir/commands/commands/toggle_auto_time.py +++ b/src/fenrir/commands/commands/toggle_auto_time.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): pass diff --git a/src/fenrir/commands/commands/toggle_braille.py b/src/fenrir/commands/commands/toggle_braille.py index ab50b4ca..0929d489 100644 --- a/src/fenrir/commands/commands/toggle_braille.py +++ b/src/fenrir/commands/commands/toggle_braille.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/toggle_emoticons.py b/src/fenrir/commands/commands/toggle_emoticons.py index ecfb9859..e44e6da3 100644 --- a/src/fenrir/commands/commands/toggle_emoticons.py +++ b/src/fenrir/commands/commands/toggle_emoticons.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): pass diff --git a/src/fenrir/commands/commands/toggle_highlight_tracking.py b/src/fenrir/commands/commands/toggle_highlight_tracking.py index 0eec564b..bc2f5107 100644 --- a/src/fenrir/commands/commands/toggle_highlight_tracking.py +++ b/src/fenrir/commands/commands/toggle_highlight_tracking.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): pass diff --git a/src/fenrir/commands/commands/toggle_output.py b/src/fenrir/commands/commands/toggle_output.py index 13b5f78e..a1b29cec 100644 --- a/src/fenrir/commands/commands/toggle_output.py +++ b/src/fenrir/commands/commands/toggle_output.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/toggle_punctuation_level.py b/src/fenrir/commands/commands/toggle_punctuation_level.py index f96f3b70..257ff0f6 100644 --- a/src/fenrir/commands/commands/toggle_punctuation_level.py +++ b/src/fenrir/commands/commands/toggle_punctuation_level.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/toggle_sound.py b/src/fenrir/commands/commands/toggle_sound.py index 5ce0cf41..8febec81 100644 --- a/src/fenrir/commands/commands/toggle_sound.py +++ b/src/fenrir/commands/commands/toggle_sound.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/toggle_speech.py b/src/fenrir/commands/commands/toggle_speech.py index 22a04810..83675c0e 100644 --- a/src/fenrir/commands/commands/toggle_speech.py +++ b/src/fenrir/commands/commands/toggle_speech.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/toggle_tutorial_mode.py b/src/fenrir/commands/commands/toggle_tutorial_mode.py index 1a22c993..8c89f957 100644 --- a/src/fenrir/commands/commands/toggle_tutorial_mode.py +++ b/src/fenrir/commands/commands/toggle_tutorial_mode.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/help/curr_help.py b/src/fenrir/commands/help/curr_help.py index f4cfaa3b..1de0abc5 100644 --- a/src/fenrir/commands/help/curr_help.py +++ b/src/fenrir/commands/help/curr_help.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/help/next_help.py b/src/fenrir/commands/help/next_help.py index da310971..0f268aa8 100644 --- a/src/fenrir/commands/help/next_help.py +++ b/src/fenrir/commands/help/next_help.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/help/prev_help.py b/src/fenrir/commands/help/prev_help.py index 82488488..31eccbb6 100644 --- a/src/fenrir/commands/help/prev_help.py +++ b/src/fenrir/commands/help/prev_help.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onCursorChange/45000-char_echo.py b/src/fenrir/commands/onCursorChange/45000-char_echo.py index 3ce8b8a7..fbf086dc 100644 --- a/src/fenrir/commands/onCursorChange/45000-char_echo.py +++ b/src/fenrir/commands/onCursorChange/45000-char_echo.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onCursorChange/50000-present_char_if_cursor_change_horizontal.py b/src/fenrir/commands/onCursorChange/50000-present_char_if_cursor_change_horizontal.py index 3f0318d3..ab09adaa 100644 --- a/src/fenrir/commands/onCursorChange/50000-present_char_if_cursor_change_horizontal.py +++ b/src/fenrir/commands/onCursorChange/50000-present_char_if_cursor_change_horizontal.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import char_utils +from core import debug +from utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/onCursorChange/55000-present_line_if_cursor_change_vertical.py b/src/fenrir/commands/onCursorChange/55000-present_line_if_cursor_change_vertical.py index af445d54..fb0bd721 100644 --- a/src/fenrir/commands/onCursorChange/55000-present_line_if_cursor_change_vertical.py +++ b/src/fenrir/commands/onCursorChange/55000-present_line_if_cursor_change_vertical.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import line_utils -from fenrir.utils import word_utils +from core import debug +from utils import line_utils +from utils import word_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/onCursorChange/60000-word_echo_type.py b/src/fenrir/commands/onCursorChange/60000-word_echo_type.py index d8e0031e..995dd85f 100644 --- a/src/fenrir/commands/onCursorChange/60000-word_echo_type.py +++ b/src/fenrir/commands/onCursorChange/60000-word_echo_type.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import word_utils +from core import debug +from utils import word_utils import string class command(): diff --git a/src/fenrir/commands/onCursorChange/61000-word_echo_navigation.py b/src/fenrir/commands/onCursorChange/61000-word_echo_navigation.py index 0f9c91e7..69963a15 100644 --- a/src/fenrir/commands/onCursorChange/61000-word_echo_navigation.py +++ b/src/fenrir/commands/onCursorChange/61000-word_echo_navigation.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import word_utils +from core import debug +from utils import word_utils import string class command(): diff --git a/src/fenrir/commands/onCursorChange/62000-spell_check.py b/src/fenrir/commands/onCursorChange/62000-spell_check.py index fcb063b0..2894d274 100644 --- a/src/fenrir/commands/onCursorChange/62000-spell_check.py +++ b/src/fenrir/commands/onCursorChange/62000-spell_check.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import word_utils +from core import debug +from utils import word_utils import os, string initialized = False diff --git a/src/fenrir/commands/onCursorChange/65000-char_delete_echo.py b/src/fenrir/commands/onCursorChange/65000-char_delete_echo.py index 0bbbb1cb..51310877 100644 --- a/src/fenrir/commands/onCursorChange/65000-char_delete_echo.py +++ b/src/fenrir/commands/onCursorChange/65000-char_delete_echo.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onCursorChange/66000-exit_review_mode.py b/src/fenrir/commands/onCursorChange/66000-exit_review_mode.py index ac4c1689..2f7a8cfa 100644 --- a/src/fenrir/commands/onCursorChange/66000-exit_review_mode.py +++ b/src/fenrir/commands/onCursorChange/66000-exit_review_mode.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onHeartBeat/2000-GetSessionInfo.py b/src/fenrir/commands/onHeartBeat/2000-GetSessionInfo.py index 8684d9b6..b4d822a3 100755 --- a/src/fenrir/commands/onHeartBeat/2000-GetSessionInfo.py +++ b/src/fenrir/commands/onHeartBeat/2000-GetSessionInfo.py @@ -5,7 +5,7 @@ import time # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug import time import datetime diff --git a/src/fenrir/commands/onHeartBeat/76000-time.py b/src/fenrir/commands/onHeartBeat/76000-time.py index 310813e6..3b9b55b6 100755 --- a/src/fenrir/commands/onHeartBeat/76000-time.py +++ b/src/fenrir/commands/onHeartBeat/76000-time.py @@ -5,7 +5,7 @@ import time # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug import time import datetime diff --git a/src/fenrir/commands/onHeartBeat/deactive/1.echo.py b/src/fenrir/commands/onHeartBeat/deactive/1.echo.py index b940e95e..678dc9cd 100755 --- a/src/fenrir/commands/onHeartBeat/deactive/1.echo.py +++ b/src/fenrir/commands/onHeartBeat/deactive/1.echo.py @@ -5,7 +5,7 @@ import time # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug import time class command(): diff --git a/src/fenrir/commands/onInput/10000-shut_up.py b/src/fenrir/commands/onInput/10000-shut_up.py index f5367942..b3a2dea7 100644 --- a/src/fenrir/commands/onInput/10000-shut_up.py +++ b/src/fenrir/commands/onInput/10000-shut_up.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onInput/15000-enable_temp_speech.py b/src/fenrir/commands/onInput/15000-enable_temp_speech.py index e83fef32..a6de077e 100644 --- a/src/fenrir/commands/onInput/15000-enable_temp_speech.py +++ b/src/fenrir/commands/onInput/15000-enable_temp_speech.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onInput/80000-capslock.py b/src/fenrir/commands/onInput/80000-capslock.py index aaa4e1e0..84819bc5 100644 --- a/src/fenrir/commands/onInput/80000-capslock.py +++ b/src/fenrir/commands/onInput/80000-capslock.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onInput/80300-scrolllock.py b/src/fenrir/commands/onInput/80300-scrolllock.py index 0aee16f2..f159a4a0 100644 --- a/src/fenrir/commands/onInput/80300-scrolllock.py +++ b/src/fenrir/commands/onInput/80300-scrolllock.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onInput/80500-numlock.py b/src/fenrir/commands/onInput/80500-numlock.py index 845e7638..86ab5341 100644 --- a/src/fenrir/commands/onInput/80500-numlock.py +++ b/src/fenrir/commands/onInput/80500-numlock.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onPlugInputDevice/50000-UpdateDevices.py b/src/fenrir/commands/onPlugInputDevice/50000-UpdateDevices.py index 4a0b6254..37a392ed 100755 --- a/src/fenrir/commands/onPlugInputDevice/50000-UpdateDevices.py +++ b/src/fenrir/commands/onPlugInputDevice/50000-UpdateDevices.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onScreenChanged/10000-shut_up.py b/src/fenrir/commands/onScreenChanged/10000-shut_up.py index a38149b4..884c4264 100644 --- a/src/fenrir/commands/onScreenChanged/10000-shut_up.py +++ b/src/fenrir/commands/onScreenChanged/10000-shut_up.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onScreenChanged/80000-screen_change_announcement.py b/src/fenrir/commands/onScreenChanged/80000-screen_change_announcement.py index efabee03..b59b8631 100644 --- a/src/fenrir/commands/onScreenChanged/80000-screen_change_announcement.py +++ b/src/fenrir/commands/onScreenChanged/80000-screen_change_announcement.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onScreenChanged/85000-reset_marks.py b/src/fenrir/commands/onScreenChanged/85000-reset_marks.py index 4e588d5e..501f7ad0 100644 --- a/src/fenrir/commands/onScreenChanged/85000-reset_marks.py +++ b/src/fenrir/commands/onScreenChanged/85000-reset_marks.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onScreenChanged/89000-leave_review_mode.py b/src/fenrir/commands/onScreenChanged/89000-leave_review_mode.py index ba4e680c..84240ebe 100644 --- a/src/fenrir/commands/onScreenChanged/89000-leave_review_mode.py +++ b/src/fenrir/commands/onScreenChanged/89000-leave_review_mode.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onScreenUpdate/56000-highlight_tracking.py b/src/fenrir/commands/onScreenUpdate/56000-highlight_tracking.py index b22cc69b..419966f8 100644 --- a/src/fenrir/commands/onScreenUpdate/56000-highlight_tracking.py +++ b/src/fenrir/commands/onScreenUpdate/56000-highlight_tracking.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): pass diff --git a/src/fenrir/commands/onScreenUpdate/60000-history.py b/src/fenrir/commands/onScreenUpdate/60000-history.py index daaf04ec..0ecea111 100644 --- a/src/fenrir/commands/onScreenUpdate/60000-history.py +++ b/src/fenrir/commands/onScreenUpdate/60000-history.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onScreenUpdate/70000-incoming.py b/src/fenrir/commands/onScreenUpdate/70000-incoming.py index b2e70d84..7f8c1a85 100644 --- a/src/fenrir/commands/onScreenUpdate/70000-incoming.py +++ b/src/fenrir/commands/onScreenUpdate/70000-incoming.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onScreenUpdate/75000-incoming_promote.py b/src/fenrir/commands/onScreenUpdate/75000-incoming_promote.py index ea4ed64a..63cb2c82 100644 --- a/src/fenrir/commands/onScreenUpdate/75000-incoming_promote.py +++ b/src/fenrir/commands/onScreenUpdate/75000-incoming_promote.py @@ -5,7 +5,7 @@ import time # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onSwitchApplicationProfile/default.py b/src/fenrir/commands/onSwitchApplicationProfile/default.py index 01842174..04558ae3 100644 --- a/src/fenrir/commands/onSwitchApplicationProfile/default.py +++ b/src/fenrir/commands/onSwitchApplicationProfile/default.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onSwitchApplicationProfile/inactive/agetty.py b/src/fenrir/commands/onSwitchApplicationProfile/inactive/agetty.py index 7a205b65..1fb59c8d 100644 --- a/src/fenrir/commands/onSwitchApplicationProfile/inactive/agetty.py +++ b/src/fenrir/commands/onSwitchApplicationProfile/inactive/agetty.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onSwitchApplicationProfile/inactive/bash.py b/src/fenrir/commands/onSwitchApplicationProfile/inactive/bash.py index 3b0abb00..7a5d7540 100644 --- a/src/fenrir/commands/onSwitchApplicationProfile/inactive/bash.py +++ b/src/fenrir/commands/onSwitchApplicationProfile/inactive/bash.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onSwitchApplicationProfile/inactive/vim.py b/src/fenrir/commands/onSwitchApplicationProfile/inactive/vim.py index 38664267..78f02af9 100644 --- a/src/fenrir/commands/onSwitchApplicationProfile/inactive/vim.py +++ b/src/fenrir/commands/onSwitchApplicationProfile/inactive/vim.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/switchTrigger_template.py b/src/fenrir/commands/switchTrigger_template.py index 8420da38..8efbea56 100644 --- a/src/fenrir/commands/switchTrigger_template.py +++ b/src/fenrir/commands/switchTrigger_template.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class command(): def __init__(self): diff --git a/src/fenrir/core/applicationManager.py b/src/fenrir/core/applicationManager.py index ccea4b51..202e6e35 100644 --- a/src/fenrir/core/applicationManager.py +++ b/src/fenrir/core/applicationManager.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class applicationManager(): def __init__(self): diff --git a/src/fenrir/core/brailleDriver.py b/src/fenrir/core/brailleDriver.py index df5c29d2..a3504cec 100644 --- a/src/fenrir/core/brailleDriver.py +++ b/src/fenrir/core/brailleDriver.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class brailleDriver(): def __init__(self): diff --git a/src/fenrir/core/commandData.py b/src/fenrir/core/commandData.py index 4cc3f68b..e653de30 100644 --- a/src/fenrir/core/commandData.py +++ b/src/fenrir/core/commandData.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug import time # used as shared memory between commands diff --git a/src/fenrir/core/commandManager.py b/src/fenrir/core/commandManager.py index 8ce66b72..fd10c13c 100644 --- a/src/fenrir/core/commandManager.py +++ b/src/fenrir/core/commandManager.py @@ -8,8 +8,8 @@ import glob, os, time, inspect currentdir = os.path.dirname(os.path.realpath(os.path.abspath(inspect.getfile(inspect.currentframe())))) fenrirPath = os.path.dirname(currentdir) -from fenrir.core import debug -from fenrir.utils import module_utils +from core import debug +from utils import module_utils class commandManager(): def __init__(self): diff --git a/src/fenrir/core/cursorManager.py b/src/fenrir/core/cursorManager.py index 43e76673..2a3191e1 100644 --- a/src/fenrir/core/cursorManager.py +++ b/src/fenrir/core/cursorManager.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class cursorManager(): def __init__(self): diff --git a/src/fenrir/core/debugManager.py b/src/fenrir/core/debugManager.py index 9bb284c2..304ebbd7 100644 --- a/src/fenrir/core/debugManager.py +++ b/src/fenrir/core/debugManager.py @@ -1,7 +1,7 @@ #!/usr/bin/python # Debugger module for the Fenrir screen reader. -from fenrir.core import debug +from core import debug from datetime import datetime class debugManager(): diff --git a/src/fenrir/core/environment.py b/src/fenrir/core/environment.py index 91d605c1..b8838e15 100644 --- a/src/fenrir/core/environment.py +++ b/src/fenrir/core/environment.py @@ -4,15 +4,15 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.core.settingsData import settingsData -from fenrir.core.runtimeData import runtimeData -from fenrir.core.screenData import screenData -from fenrir.core.outputData import outputData -from fenrir.core.generalData import generalData -from fenrir.core import commandData -from fenrir.core.inputData import inputData -from fenrir.core.punctuationData import punctuationData +from core import debug +from core.settingsData import settingsData +from core.runtimeData import runtimeData +from core.screenData import screenData +from core.outputData import outputData +from core.generalData import generalData +from core import commandData +from core.inputData import inputData +from core.punctuationData import punctuationData environment = { 'screen': screenData, diff --git a/src/fenrir/core/eventData.py b/src/fenrir/core/eventData.py index 804936da..be5db45a 100644 --- a/src/fenrir/core/eventData.py +++ b/src/fenrir/core/eventData.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug from enum import Enum class fenrirEventType(Enum): diff --git a/src/fenrir/core/eventManager.py b/src/fenrir/core/eventManager.py index 20864228..d34ac94e 100644 --- a/src/fenrir/core/eventManager.py +++ b/src/fenrir/core/eventManager.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.core.eventData import fenrirEventType +from core import debug +from core.eventData import fenrirEventType from queue import Empty import time from multiprocessing import Queue diff --git a/src/fenrir/core/fenrirManager.py b/src/fenrir/core/fenrirManager.py index 489a1415..6a375ca8 100644 --- a/src/fenrir/core/fenrirManager.py +++ b/src/fenrir/core/fenrirManager.py @@ -6,10 +6,10 @@ import os, sys, signal, time -from fenrir.core import i18n -from fenrir.core import settingsManager -from fenrir.core import debug -from fenrir.core.eventData import fenrirEventType +from core import i18n +from core import settingsManager +from core import debug +from core.eventData import fenrirEventType import argparse class fenrirManager(): diff --git a/src/fenrir/core/generalData.py b/src/fenrir/core/generalData.py index 26c95d72..98404ccf 100644 --- a/src/fenrir/core/generalData.py +++ b/src/fenrir/core/generalData.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug generalData = { 'args': None, diff --git a/src/fenrir/core/helpManager.py b/src/fenrir/core/helpManager.py index b4e0898a..0370ed70 100755 --- a/src/fenrir/core/helpManager.py +++ b/src/fenrir/core/helpManager.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class helpManager(): diff --git a/src/fenrir/core/inputData.py b/src/fenrir/core/inputData.py index 3c059b21..6b2fdf95 100644 --- a/src/fenrir/core/inputData.py +++ b/src/fenrir/core/inputData.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug import time inputData = { diff --git a/src/fenrir/core/inputManager.py b/src/fenrir/core/inputManager.py index 7b06778b..43195074 100644 --- a/src/fenrir/core/inputManager.py +++ b/src/fenrir/core/inputManager.py @@ -5,7 +5,7 @@ # By Chrys, Storm Dragon, and contributers. import time -from fenrir.core import debug +from core import debug class inputManager(): def __init__(self): diff --git a/src/fenrir/core/outputData.py b/src/fenrir/core/outputData.py index 4a91bbb5..684acd60 100644 --- a/src/fenrir/core/outputData.py +++ b/src/fenrir/core/outputData.py @@ -5,7 +5,7 @@ # By Chrys, Storm Dragon, and contributers. import time -from fenrir.core import debug +from core import debug outputData = { 'nextFlush': time.time(), diff --git a/src/fenrir/core/outputManager.py b/src/fenrir/core/outputManager.py index b4fda640..d3e211a0 100644 --- a/src/fenrir/core/outputManager.py +++ b/src/fenrir/core/outputManager.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.utils import line_utils +from core import debug +from utils import line_utils import string, time class outputManager(): diff --git a/src/fenrir/core/processManager.py b/src/fenrir/core/processManager.py index 7f58abe8..0f29837a 100644 --- a/src/fenrir/core/processManager.py +++ b/src/fenrir/core/processManager.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug -from fenrir.core.eventData import fenrirEventType +from core import debug +from core.eventData import fenrirEventType import time from threading import Thread from multiprocessing import Process diff --git a/src/fenrir/core/punctuationData.py b/src/fenrir/core/punctuationData.py index fad7113b..1ba130bd 100644 --- a/src/fenrir/core/punctuationData.py +++ b/src/fenrir/core/punctuationData.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug import string punctuationData = { diff --git a/src/fenrir/core/punctuationManager.py b/src/fenrir/core/punctuationManager.py index a37215b0..3038ebe8 100644 --- a/src/fenrir/core/punctuationManager.py +++ b/src/fenrir/core/punctuationManager.py @@ -5,7 +5,7 @@ # By Chrys, Storm Dragon, and contributers. import string -from fenrir.core import debug +from core import debug class punctuationManager(): def __init__(self): diff --git a/src/fenrir/core/runtimeData.py b/src/fenrir/core/runtimeData.py index 1077912d..1041d4ee 100644 --- a/src/fenrir/core/runtimeData.py +++ b/src/fenrir/core/runtimeData.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug runtimeData = { 'speechDriver': None, diff --git a/src/fenrir/core/screenData.py b/src/fenrir/core/screenData.py index 8027e0cc..9f4d0a61 100644 --- a/src/fenrir/core/screenData.py +++ b/src/fenrir/core/screenData.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug import time screenData = { diff --git a/src/fenrir/core/screenDriver.py b/src/fenrir/core/screenDriver.py index d7a2a74c..418a67f0 100644 --- a/src/fenrir/core/screenDriver.py +++ b/src/fenrir/core/screenDriver.py @@ -11,7 +11,7 @@ #bold = 1 if attr & 16 else 0 -from fenrir.core import debug +from core import debug class screenDriver(): def __init__(self): diff --git a/src/fenrir/core/screenManager.py b/src/fenrir/core/screenManager.py index f9f628b9..29e45d67 100644 --- a/src/fenrir/core/screenManager.py +++ b/src/fenrir/core/screenManager.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug import time class screenManager(): diff --git a/src/fenrir/core/settingsData.py b/src/fenrir/core/settingsData.py index 738af3e9..fcd107dd 100644 --- a/src/fenrir/core/settingsData.py +++ b/src/fenrir/core/settingsData.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug settingsData = { 'sound': { diff --git a/src/fenrir/core/settingsManager.py b/src/fenrir/core/settingsManager.py index dd926347..0811de29 100644 --- a/src/fenrir/core/settingsManager.py +++ b/src/fenrir/core/settingsManager.py @@ -9,7 +9,6 @@ currentdir = os.path.dirname(os.path.realpath(os.path.abspath(inspect.getfile(in fenrirPath = os.path.dirname(currentdir) from configparser import ConfigParser -<<<<<<< HEAD from core import debugManager from core import memoryManager from core import processManager @@ -29,24 +28,6 @@ from core import inputData from core.settingsData import settingsData from core import debug from utils import module_utils -======= -from fenrir.core import debugManager -from fenrir.core import processManager -from fenrir.core import eventManager -from fenrir.core import inputManager -from fenrir.core import outputManager -from fenrir.core import commandManager -from fenrir.core import screenManager -from fenrir.core import punctuationManager -from fenrir.core import cursorManager -from fenrir.core import applicationManager -from fenrir.core import helpManager -from fenrir.core import environment -from fenrir.core import inputData -from fenrir.core.settingsData import settingsData -from fenrir.core import debug -from fenrir.utils import module_utils ->>>>>>> 1.5 class settingsManager(): def __init__(self): diff --git a/src/fenrir/core/soundDriver.py b/src/fenrir/core/soundDriver.py index fb59c504..0f2d4ab7 100644 --- a/src/fenrir/core/soundDriver.py +++ b/src/fenrir/core/soundDriver.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class soundDriver(): def __init__(self): diff --git a/src/fenrir/core/speechDriver.py b/src/fenrir/core/speechDriver.py index 3966bee8..539412f3 100644 --- a/src/fenrir/core/speechDriver.py +++ b/src/fenrir/core/speechDriver.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug class speechDriver(): def __init__(self): diff --git a/src/fenrir/fenrir b/src/fenrir/fenrir index b6a8a13f..d8107dfe 100755 --- a/src/fenrir/fenrir +++ b/src/fenrir/fenrir @@ -10,7 +10,7 @@ fenrirPath = os.path.dirname(os.path.realpath(os.path.abspath(inspect.getfile(in if not fenrirPath in sys.path: sys.path.append(fenrirPath) -from fenrir.core import fenrirManager +from core import fenrirManager def main(): app = fenrirManager.fenrirManager() diff --git a/src/fenrir/fenrir-daemon b/src/fenrir/fenrir-daemon index f8d0f9c1..eefc5054 100755 --- a/src/fenrir/fenrir-daemon +++ b/src/fenrir/fenrir-daemon @@ -10,7 +10,7 @@ fenrirPath = os.path.dirname(os.path.realpath(os.path.abspath(inspect.getfile(in if not fenrirPath in sys.path: sys.path.append(fenrirPath) -from fenrir.core import fenrirManager +from core import fenrirManager from daemonize import Daemonize pidFile = "/run/fenrir.pid" diff --git a/src/fenrir/inputDriver/dummyDriver.py b/src/fenrir/inputDriver/dummyDriver.py index 524b9188..917ee1f7 100644 --- a/src/fenrir/inputDriver/dummyDriver.py +++ b/src/fenrir/inputDriver/dummyDriver.py @@ -5,12 +5,8 @@ # By Chrys, Storm Dragon, and contributers. import time -<<<<<<< HEAD from core import debug from core.inputDriver import inputDriver -======= -from fenrir.core import debug ->>>>>>> 1.5 class driver(inputDriver): def __init__(self): diff --git a/src/fenrir/inputDriver/evdevDriver.py b/src/fenrir/inputDriver/evdevDriver.py index c75301ba..44e8fa36 100644 --- a/src/fenrir/inputDriver/evdevDriver.py +++ b/src/fenrir/inputDriver/evdevDriver.py @@ -28,16 +28,10 @@ import multiprocessing from multiprocessing.sharedctypes import Value from ctypes import c_bool -<<<<<<< HEAD from core.eventData import fenrirEventType from core import inputData from core import debug from core.inputDriver import inputDriver -======= -from fenrir.core.eventData import fenrirEventType -from fenrir.core import inputData -from fenrir.core import debug ->>>>>>> 1.5 class driver(inputDriver): def __init__(self): diff --git a/src/fenrir/screenDriver/vcsaDriver.py b/src/fenrir/screenDriver/vcsaDriver.py index d58e282d..8d792c5e 100644 --- a/src/fenrir/screenDriver/vcsaDriver.py +++ b/src/fenrir/screenDriver/vcsaDriver.py @@ -23,17 +23,12 @@ import fcntl from array import array import errno import sys -from fenrir.utils import screen_utils +from utils import screen_utils from fcntl import ioctl from struct import unpack_from, unpack, pack -<<<<<<< HEAD from core import debug from core.eventData import fenrirEventType from core.screenDriver import screenDriver -======= -from fenrir.core import debug -from fenrir.core.eventData import fenrirEventType ->>>>>>> 1.5 class driver(screenDriver): def __init__(self): diff --git a/src/fenrir/soundDriver/dummyDriver.py b/src/fenrir/soundDriver/dummyDriver.py index 28065467..87e8a6a1 100644 --- a/src/fenrir/soundDriver/dummyDriver.py +++ b/src/fenrir/soundDriver/dummyDriver.py @@ -4,12 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -<<<<<<< HEAD from core import debug from core.soundDriver import soundDriver -======= -from fenrir.core import debug ->>>>>>> 1.5 class driver(soundDriver): def __init__(self): diff --git a/src/fenrir/soundDriver/genericDriver.py b/src/fenrir/soundDriver/genericDriver.py index d490e897..5a85d6f4 100644 --- a/src/fenrir/soundDriver/genericDriver.py +++ b/src/fenrir/soundDriver/genericDriver.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug import subprocess from core.soundDriver import soundDriver diff --git a/src/fenrir/soundDriver/gstreamerDriver.py b/src/fenrir/soundDriver/gstreamerDriver.py index 3d2c10cd..33565d53 100644 --- a/src/fenrir/soundDriver/gstreamerDriver.py +++ b/src/fenrir/soundDriver/gstreamerDriver.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug import time, threading from core.soundDriver import soundDriver diff --git a/src/fenrir/speechDriver/dummyDriver.py b/src/fenrir/speechDriver/dummyDriver.py index 1e143f57..c8ea4faa 100644 --- a/src/fenrir/speechDriver/dummyDriver.py +++ b/src/fenrir/speechDriver/dummyDriver.py @@ -5,12 +5,8 @@ # By Chrys, Storm Dragon, and contributers. # generic driver -<<<<<<< HEAD from core import debug from core.speechDriver import speechDriver -======= -from fenrir.core import debug ->>>>>>> 1.5 class driver(speechDriver): def __init__(self): diff --git a/src/fenrir/speechDriver/emacspeakDriver.py b/src/fenrir/speechDriver/emacspeakDriver.py index 5608a2e2..488da091 100644 --- a/src/fenrir/speechDriver/emacspeakDriver.py +++ b/src/fenrir/speechDriver/emacspeakDriver.py @@ -5,10 +5,6 @@ # By Chrys, Storm Dragon, and contributers. # generic driver -<<<<<<< HEAD -======= -from fenrir.core import debug ->>>>>>> 1.5 from subprocess import Popen, PIPE import pexpect import ptyprocess diff --git a/src/fenrir/speechDriver/espeakDriver.py b/src/fenrir/speechDriver/espeakDriver.py index 31db6640..7cf8fcac 100644 --- a/src/fenrir/speechDriver/espeakDriver.py +++ b/src/fenrir/speechDriver/espeakDriver.py @@ -5,12 +5,8 @@ # By Chrys, Storm Dragon, and contributers. # Espeak driver -<<<<<<< HEAD from core import debug from core.speechDriver import speechDriver -======= -from fenrir.core import debug ->>>>>>> 1.5 class driver(speechDriver): def __init__(self): diff --git a/src/fenrir/speechDriver/genericDriver.py b/src/fenrir/speechDriver/genericDriver.py index 134d97d8..7fdd40d8 100644 --- a/src/fenrir/speechDriver/genericDriver.py +++ b/src/fenrir/speechDriver/genericDriver.py @@ -5,7 +5,7 @@ # By Chrys, Storm Dragon, and contributers. # generic driver -from fenrir.core import debug +from core import debug from threading import Thread, Lock from queue import Queue, Empty from subprocess import Popen diff --git a/src/fenrir/speechDriver/speechdDriver.py b/src/fenrir/speechDriver/speechdDriver.py index e762cdd4..99293a8f 100644 --- a/src/fenrir/speechDriver/speechdDriver.py +++ b/src/fenrir/speechDriver/speechdDriver.py @@ -5,12 +5,8 @@ # By Chrys, Storm Dragon, and contributers. # speech-dispatcher driver -<<<<<<< HEAD from core import debug from core.speechDriver import speechDriver -======= -from fenrir.core import debug ->>>>>>> 1.5 class driver(speechDriver): def __init__(self): diff --git a/src/fenrir/utils/char_utils.py b/src/fenrir/utils/char_utils.py index 0d3aa801..1dc9d266 100644 --- a/src/fenrir/utils/char_utils.py +++ b/src/fenrir/utils/char_utils.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug def getPrevChar(currX,currY, currText): lineBreak = False diff --git a/src/fenrir/utils/line_utils.py b/src/fenrir/utils/line_utils.py index 2ba20702..7e6340f0 100644 --- a/src/fenrir/utils/line_utils.py +++ b/src/fenrir/utils/line_utils.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug from collections import Counter def getPrevLine(currX,currY, currText): diff --git a/src/fenrir/utils/mark_utils.py b/src/fenrir/utils/mark_utils.py index 2867b9bb..d52b53f1 100644 --- a/src/fenrir/utils/mark_utils.py +++ b/src/fenrir/utils/mark_utils.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug def getTextBetweenMarks(firstMark, secondMark, inText): if inText == None: diff --git a/src/fenrir/utils/review_utils.py b/src/fenrir/utils/review_utils.py index 78c5edaa..1bca1526 100644 --- a/src/fenrir/utils/review_utils.py +++ b/src/fenrir/utils/review_utils.py @@ -4,5 +4,5 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug diff --git a/src/fenrir/utils/screen_utils.py b/src/fenrir/utils/screen_utils.py index 625bfbd4..6a3db6ec 100644 --- a/src/fenrir/utils/screen_utils.py +++ b/src/fenrir/utils/screen_utils.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug from collections import Counter import string from select import select diff --git a/src/fenrir/utils/word_utils.py b/src/fenrir/utils/word_utils.py index 40533dd9..349b172a 100644 --- a/src/fenrir/utils/word_utils.py +++ b/src/fenrir/utils/word_utils.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrir.core import debug +from core import debug import string def getCurrentWord(currX,currY, currText):