diff --git a/docu/user.md b/docu/user.md index 60917166..fe99f318 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 core import debug + from fenrir.core import debug class command(): def __init__(self): diff --git a/docu/user.txt b/docu/user.txt index 5c8e1c60..c88d9524 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 core import debug + from fenrir.core import debug class command(): def __init__(self): diff --git a/setup.py b/setup.py index ee28bf24..6bc3b470 100755 --- a/setup.py +++ b/setup.py @@ -78,8 +78,8 @@ setup( author_email="chrysg@linux-a11y.org", # Packages - packages=find_packages('src/fenrir'), - package_dir={'': 'src/fenrir'}, + packages=find_packages('src'), + package_dir={'': 'src'}, 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 f7e63b83..66de4179 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 core import debug -from core.brailleDriver import brailleDriver +from fenrir.core import debug +from fenrir.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 be13dd4d..cc88d6ee 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 core import debug -from core.brailleDriver import brailleDriver +from fenrir.core import debug +from fenrir.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 25b6b1a8..843b9a4e 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 core import debug +from fenrir.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 2eb5c579..7c26fc3a 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 core import debug -from utils import word_utils +from fenrir.core import debug +from fenrir.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 86285b1f..815c269c 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 core import debug -from utils import screen_utils +from fenrir.core import debug +from fenrir.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 28923622..d1520bac 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 core import debug -from utils import mark_utils -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import mark_utils +from fenrir.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 d85dcf27..03e01825 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 core import debug -from utils import mark_utils -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import mark_utils +from fenrir.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 e25c59c2..a087d4d3 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 core import debug -from utils import mark_utils -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import mark_utils +from fenrir.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 490e49b7..418851e1 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 core import debug -from utils import mark_utils -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import mark_utils +from fenrir.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 09543ea6..4e3889a3 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 core import debug -from utils import mark_utils -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import mark_utils +from fenrir.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 4df87ac9..ac6d531a 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 core import debug -from utils import mark_utils -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import mark_utils +from fenrir.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 0073e40a..14e43716 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 core import debug -from utils import mark_utils -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import mark_utils +from fenrir.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 8275698d..2e607dfb 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 core import debug -from utils import mark_utils -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import mark_utils +from fenrir.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 6a5f2e42..136c112e 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 core import debug -from utils import mark_utils -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import mark_utils +from fenrir.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 a86fcd1c..e57b2ae2 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 core import debug -from utils import mark_utils -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import mark_utils +from fenrir.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 3c0ece33..f55f03b0 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 core import debug +from fenrir.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 284dacc7..ed16ed49 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 core import debug +from fenrir.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 c0272fba..9326b014 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 core import debug +from fenrir.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 01cecbbe..3ccfa8e1 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 core import debug +from fenrir.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 d543a97e..cbae7230 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 core import debug +from fenrir.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 5e77a224..56728378 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 core import debug +from fenrir.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 baa3daea..611f6875 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 core import debug +from fenrir.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 924ed7d7..c368347e 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 core import debug +from fenrir.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 781d8aa0..cb624581 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 core import debug +from fenrir.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 54a06923..4733c59e 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 core import debug +from fenrir.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 a79267fc..1c4e4adf 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 core import debug +from fenrir.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 39cb1435..7392b9c0 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 core import debug +from fenrir.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 b5e22414..d8b5c0e1 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 core import debug +from fenrir.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 a9fd30a4..f71e79c3 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 core import debug +from fenrir.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 781e6acf..38fbfcdc 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 core import debug +from fenrir.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 11af3045..761281ae 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 core import debug +from fenrir.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 c83fdeb0..6da0fced 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 core import debug -from utils import mark_utils +from fenrir.core import debug +from fenrir.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 9c2baf3e..4aa81beb 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 core import debug +from fenrir.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 2de39736..99f1a9e0 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 core import debug +from fenrir.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 1e059cc9..3b13e96b 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 core import debug -from utils import mark_utils +from fenrir.core import debug +from fenrir.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 8fd0a851..f29a9a81 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 core import debug -from utils import mark_utils +from fenrir.core import debug +from fenrir.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 d3c119a6..f9819e79 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 core import debug +from fenrir.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 a8b39ce6..d0d9641e 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 core import debug +from fenrir.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 99b13fab..f05ecbc1 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 core import debug +from fenrir.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 93e8a8a0..4aa959d6 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 core import debug -from utils import line_utils +from fenrir.core import debug +from fenrir.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 39fc28ef..9b086110 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 core import debug +from fenrir.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 cd2aee07..230d0ca2 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 core import debug +from fenrir.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 c97414ce..b80e4fde 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 core import debug +from fenrir.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 09e53b7c..4a2bb87a 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 core import debug +from fenrir.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 a0248662..054f5cfe 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 core import debug +from fenrir.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 946803cb..279897aa 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 core import debug +from fenrir.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 9c0369c4..a0fa424c 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 core import debug +from fenrir.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 0e1078ac..be25c936 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 core import debug +from fenrir.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 25175c1f..c6245d14 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 core import debug +from fenrir.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 a4d98c87..7deb4977 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 core import debug +from fenrir.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 c3e718fe..d5ba035f 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 core import debug +from fenrir.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 67b4f398..50e7e807 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 core import debug -from utils import mark_utils +from fenrir.core import debug +from fenrir.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 51f38c79..dce3c80c 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 core import debug +from fenrir.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 78eee847..8bfc1351 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 core import debug +from fenrir.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 cb267b66..f298369f 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 core import debug +from fenrir.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 4db1763d..a517c588 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 core import debug +from fenrir.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 1c6716e6..331d66a3 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 core import debug +from fenrir.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 09907691..45838dc1 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 core import debug -from utils import line_utils +from fenrir.core import debug +from fenrir.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 2cf2f0bd..6ee360bf 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 core import debug +from fenrir.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 effb7f37..7e75af46 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 core import debug +from fenrir.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 9341382a..07ccccdb 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 core import debug -from utils import mark_utils +from fenrir.core import debug +from fenrir.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 01d5607a..79bf3325 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 core import debug +from fenrir.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 1223a54b..fe3e696d 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 core import debug +from fenrir.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 9d54e879..f42b4823 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 core import debug -from utils import line_utils +from fenrir.core import debug +from fenrir.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 25316f4c..938ee928 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 core import debug -from utils import line_utils +from fenrir.core import debug +from fenrir.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 9fa6c575..cd676869 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 core import debug +from fenrir.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 ea633658..2530de04 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 core import debug +from fenrir.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 0c2547e4..9e956aed 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 core import debug +from fenrir.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 f212ee27..18c142d9 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 core import debug -from utils import word_utils +from fenrir.core import debug +from fenrir.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 07a431f4..1d594674 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 core import debug +from fenrir.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 6784ba5f..95f2845c 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 core import debug -from utils import char_utils +from fenrir.core import debug +from fenrir.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 061eec43..92a27eaf 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 core import debug -from utils import char_utils +from fenrir.core import debug +from fenrir.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 af1de983..58eafabf 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 core import debug -from utils import line_utils +from fenrir.core import debug +from fenrir.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 4436cd03..e10eea38 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 core import debug -from utils import word_utils +from fenrir.core import debug +from fenrir.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 c58568cb..2a2e16f8 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 core import debug -from utils import word_utils -from utils import char_utils +from fenrir.core import debug +from fenrir.utils import word_utils +from fenrir.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 2428083e..f529483c 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 core import debug -from utils import char_utils +from fenrir.core import debug +from fenrir.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 c788a5ca..c3e10772 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 core import debug -from utils import char_utils +from fenrir.core import debug +from fenrir.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 1af5b558..8a566ce1 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 core import debug -from utils import char_utils +from fenrir.core import debug +from fenrir.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 82f687a8..73ab8457 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 core import debug -from utils import line_utils -from utils import char_utils +from fenrir.core import debug +from fenrir.utils import line_utils +from fenrir.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 f30265ee..8dd388eb 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 core import debug -from utils import char_utils +from fenrir.core import debug +from fenrir.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 e3c0a2ee..65664c46 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 core import debug -from utils import char_utils +from fenrir.core import debug +from fenrir.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 f4ae4aa3..0639df3f 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 core import debug -from utils import char_utils +from fenrir.core import debug +from fenrir.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 a41550c1..348cfc00 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 core import debug -from utils import line_utils +from fenrir.core import debug +from fenrir.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 c05ca59a..4018f79f 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 core import debug -from utils import word_utils +from fenrir.core import debug +from fenrir.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 f0e9f90e..8475b941 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 core import debug -from utils import word_utils -from utils import char_utils +from fenrir.core import debug +from fenrir.utils import word_utils +from fenrir.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 444eb32a..a6690c88 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 core import debug -from utils import char_utils +from fenrir.core import debug +from fenrir.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 e66e0883..5fc60fd1 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 core import debug -from utils import char_utils +from fenrir.core import debug +from fenrir.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 c3601955..1ff6a39d 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 core import debug -from utils import line_utils +from fenrir.core import debug +from fenrir.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 b36f3038..f6549122 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 core import debug -from utils import word_utils +from fenrir.core import debug +from fenrir.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 eeddfd3e..a5d518b2 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 core import debug -from utils import word_utils -from utils import char_utils +from fenrir.core import debug +from fenrir.utils import word_utils +from fenrir.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 aaaed438..45c40415 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 core import debug -from utils import char_utils +from fenrir.core import debug +from fenrir.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 1867e878..505935f2 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 core import debug -from utils import char_utils +from fenrir.core import debug +from fenrir.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 6a59ec79..54c754d4 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 core import debug +from fenrir.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 4a565c2f..ebfcdfa3 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 core import debug +from fenrir.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 26d02637..5540c10a 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 core import debug +from fenrir.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 8645ee3c..1efdcf42 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 core import debug +from fenrir.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 b098a50d..bc77c920 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 core import debug +from fenrir.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 6c082f91..fd96a265 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 core import debug +from fenrir.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 a309d089..f89bf9ce 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 core import debug +from fenrir.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 4803487f..742cd342 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 core import debug +from fenrir.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 362f61c9..cd1e8c7e 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 core import debug +from fenrir.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 ef53c390..b9119ae8 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 core import debug +from fenrir.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 82e1f90c..291c2248 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 core import debug +from fenrir.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 9413fcd5..fe193b78 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 core import debug +from fenrir.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 aad7226b..ba1fa52c 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 core import debug +from fenrir.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 c251ca02..8ad3de8d 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 core import debug -from utils import word_utils +from fenrir.core import debug +from fenrir.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 ac53e8d8..a075e4cd 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 core import debug +from fenrir.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 c560e780..2f5d6305 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 core import debug +from fenrir.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 4c6aa9d8..1425441e 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 core import debug +from fenrir.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 d60e9da8..b28fe786 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 core import debug +from fenrir.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 19d1e06d..86779142 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 core import debug +from fenrir.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 831cca44..477334ce 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 core import debug +from fenrir.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 0929d489..ab50b4ca 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 core import debug +from fenrir.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 e44e6da3..ecfb9859 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 core import debug +from fenrir.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 bc2f5107..0eec564b 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 core import debug +from fenrir.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 a1b29cec..13b5f78e 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 core import debug +from fenrir.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 257ff0f6..f96f3b70 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 core import debug +from fenrir.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 8febec81..5ce0cf41 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 core import debug +from fenrir.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 83675c0e..22a04810 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 core import debug +from fenrir.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 8c89f957..1a22c993 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 core import debug +from fenrir.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 1de0abc5..f4cfaa3b 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 core import debug +from fenrir.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 0f268aa8..da310971 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 core import debug +from fenrir.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 31eccbb6..82488488 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 core import debug +from fenrir.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 fbf086dc..3ce8b8a7 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 core import debug +from fenrir.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 ab09adaa..3f0318d3 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 core import debug -from utils import char_utils +from fenrir.core import debug +from fenrir.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 fb0bd721..af445d54 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 core import debug -from utils import line_utils -from utils import word_utils +from fenrir.core import debug +from fenrir.utils import line_utils +from fenrir.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 995dd85f..d8e0031e 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 core import debug -from utils import word_utils +from fenrir.core import debug +from fenrir.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 69963a15..0f9c91e7 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 core import debug -from utils import word_utils +from fenrir.core import debug +from fenrir.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 2894d274..fcb063b0 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 core import debug -from utils import word_utils +from fenrir.core import debug +from fenrir.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 51310877..0bbbb1cb 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 core import debug +from fenrir.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 2f7a8cfa..ac4c1689 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 core import debug +from fenrir.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 b4d822a3..8684d9b6 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 core import debug +from fenrir.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 3b9b55b6..310813e6 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 core import debug +from fenrir.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 678dc9cd..b940e95e 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 core import debug +from fenrir.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 b3a2dea7..f5367942 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 core import debug +from fenrir.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 a6de077e..e83fef32 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 core import debug +from fenrir.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 84819bc5..aaa4e1e0 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 core import debug +from fenrir.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 f159a4a0..0aee16f2 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 core import debug +from fenrir.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 86ab5341..845e7638 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 core import debug +from fenrir.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 37a392ed..4a0b6254 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 core import debug +from fenrir.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 884c4264..a38149b4 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 core import debug +from fenrir.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 b59b8631..efabee03 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 core import debug +from fenrir.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 501f7ad0..4e588d5e 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 core import debug +from fenrir.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 84240ebe..ba4e680c 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 core import debug +from fenrir.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 419966f8..b22cc69b 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 core import debug +from fenrir.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 0ecea111..daaf04ec 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 core import debug +from fenrir.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 7f8c1a85..b2e70d84 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 core import debug +from fenrir.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 63cb2c82..ea4ed64a 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 core import debug +from fenrir.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 04558ae3..01842174 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 core import debug +from fenrir.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 1fb59c8d..7a205b65 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 core import debug +from fenrir.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 7a5d7540..3b0abb00 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 core import debug +from fenrir.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 78f02af9..38664267 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 core import debug +from fenrir.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 8efbea56..8420da38 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 core import debug +from fenrir.core import debug class command(): def __init__(self): diff --git a/src/fenrir/core/applicationManager.py b/src/fenrir/core/applicationManager.py index 202e6e35..ccea4b51 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 core import debug +from fenrir.core import debug class applicationManager(): def __init__(self): diff --git a/src/fenrir/core/brailleDriver.py b/src/fenrir/core/brailleDriver.py index a3504cec..df5c29d2 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 core import debug +from fenrir.core import debug class brailleDriver(): def __init__(self): diff --git a/src/fenrir/core/commandData.py b/src/fenrir/core/commandData.py index e653de30..4cc3f68b 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 core import debug +from fenrir.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 fd10c13c..8ce66b72 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 core import debug -from utils import module_utils +from fenrir.core import debug +from fenrir.utils import module_utils class commandManager(): def __init__(self): diff --git a/src/fenrir/core/cursorManager.py b/src/fenrir/core/cursorManager.py index 2a3191e1..43e76673 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 core import debug +from fenrir.core import debug class cursorManager(): def __init__(self): diff --git a/src/fenrir/core/debugManager.py b/src/fenrir/core/debugManager.py index 304ebbd7..9bb284c2 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 core import debug +from fenrir.core import debug from datetime import datetime class debugManager(): diff --git a/src/fenrir/core/environment.py b/src/fenrir/core/environment.py index b8838e15..91d605c1 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 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 +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 environment = { 'screen': screenData, diff --git a/src/fenrir/core/eventData.py b/src/fenrir/core/eventData.py index be5db45a..804936da 100755 --- 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 core import debug +from fenrir.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 d34ac94e..20864228 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 core import debug -from core.eventData import fenrirEventType +from fenrir.core import debug +from fenrir.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 4ac8ec97..f68ceb27 100644 --- a/src/fenrir/core/fenrirManager.py +++ b/src/fenrir/core/fenrirManager.py @@ -6,10 +6,10 @@ import os, sys, signal, time -from core import i18n -from core import settingsManager -from core import debug -from core.eventData import fenrirEventType +from fenrir.core import i18n +from fenrir.core import settingsManager +from fenrir.core import debug +from fenrir.core.eventData import fenrirEventType import argparse class fenrirManager(): diff --git a/src/fenrir/core/generalData.py b/src/fenrir/core/generalData.py index 98404ccf..26c95d72 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 core import debug +from fenrir.core import debug generalData = { 'args': None, diff --git a/src/fenrir/core/helpManager.py b/src/fenrir/core/helpManager.py index 0370ed70..b4e0898a 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 core import debug +from fenrir.core import debug class helpManager(): diff --git a/src/fenrir/core/inputData.py b/src/fenrir/core/inputData.py index 6b2fdf95..3c059b21 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 core import debug +from fenrir.core import debug import time inputData = { diff --git a/src/fenrir/core/inputManager.py b/src/fenrir/core/inputManager.py index 139ed4c6..2902a80f 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 core import debug +from fenrir.core import debug class inputManager(): def __init__(self): diff --git a/src/fenrir/core/outputData.py b/src/fenrir/core/outputData.py index 684acd60..4a91bbb5 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 core import debug +from fenrir.core import debug outputData = { 'nextFlush': time.time(), diff --git a/src/fenrir/core/outputManager.py b/src/fenrir/core/outputManager.py index d3e211a0..b4fda640 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 core import debug -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import line_utils import string, time class outputManager(): diff --git a/src/fenrir/core/processManager.py b/src/fenrir/core/processManager.py index 0f29837a..7f58abe8 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 core import debug -from core.eventData import fenrirEventType +from fenrir.core import debug +from fenrir.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 1ba130bd..fad7113b 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 core import debug +from fenrir.core import debug import string punctuationData = { diff --git a/src/fenrir/core/punctuationManager.py b/src/fenrir/core/punctuationManager.py index 3038ebe8..a37215b0 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 core import debug +from fenrir.core import debug class punctuationManager(): def __init__(self): diff --git a/src/fenrir/core/runtimeData.py b/src/fenrir/core/runtimeData.py index 1041d4ee..1077912d 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 core import debug +from fenrir.core import debug runtimeData = { 'speechDriver': None, diff --git a/src/fenrir/core/screenData.py b/src/fenrir/core/screenData.py index 9f4d0a61..8027e0cc 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 core import debug +from fenrir.core import debug import time screenData = { diff --git a/src/fenrir/core/screenDriver.py b/src/fenrir/core/screenDriver.py index 418a67f0..d7a2a74c 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 core import debug +from fenrir.core import debug class screenDriver(): def __init__(self): diff --git a/src/fenrir/core/screenManager.py b/src/fenrir/core/screenManager.py index 29e45d67..f9f628b9 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 core import debug +from fenrir.core import debug import time class screenManager(): diff --git a/src/fenrir/core/settingsData.py b/src/fenrir/core/settingsData.py index fcd107dd..738af3e9 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 core import debug +from fenrir.core import debug settingsData = { 'sound': { diff --git a/src/fenrir/core/settingsManager.py b/src/fenrir/core/settingsManager.py index 0811de29..dd926347 100644 --- a/src/fenrir/core/settingsManager.py +++ b/src/fenrir/core/settingsManager.py @@ -9,6 +9,7 @@ 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 @@ -28,6 +29,24 @@ 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 0f2d4ab7..fb59c504 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 core import debug +from fenrir.core import debug class soundDriver(): def __init__(self): diff --git a/src/fenrir/core/speechDriver.py b/src/fenrir/core/speechDriver.py index 539412f3..3966bee8 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 core import debug +from fenrir.core import debug class speechDriver(): def __init__(self): diff --git a/src/fenrir/fenrir b/src/fenrir/fenrir index d8107dfe..b6a8a13f 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 core import fenrirManager +from fenrir.core import fenrirManager def main(): app = fenrirManager.fenrirManager() diff --git a/src/fenrir/fenrir-daemon b/src/fenrir/fenrir-daemon index eefc5054..f8d0f9c1 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 core import fenrirManager +from fenrir.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 55db7f83..92b3a4a6 100644 --- a/src/fenrir/inputDriver/dummyDriver.py +++ b/src/fenrir/inputDriver/dummyDriver.py @@ -5,8 +5,12 @@ # 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 2a5e81f5..42df1d87 100644 --- a/src/fenrir/inputDriver/evdevDriver.py +++ b/src/fenrir/inputDriver/evdevDriver.py @@ -27,10 +27,16 @@ 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 15ec123b..a17a590e 100644 --- a/src/fenrir/screenDriver/vcsaDriver.py +++ b/src/fenrir/screenDriver/vcsaDriver.py @@ -23,12 +23,17 @@ import fcntl from array import array import errno import sys -from utils import screen_utils +from fenrir.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 87e8a6a1..28065467 100644 --- a/src/fenrir/soundDriver/dummyDriver.py +++ b/src/fenrir/soundDriver/dummyDriver.py @@ -4,8 +4,12 @@ # 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 5a85d6f4..d490e897 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 core import debug +from fenrir.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 33565d53..3d2c10cd 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 core import debug +from fenrir.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 c8ea4faa..1e143f57 100644 --- a/src/fenrir/speechDriver/dummyDriver.py +++ b/src/fenrir/speechDriver/dummyDriver.py @@ -5,8 +5,12 @@ # 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 488da091..5608a2e2 100644 --- a/src/fenrir/speechDriver/emacspeakDriver.py +++ b/src/fenrir/speechDriver/emacspeakDriver.py @@ -5,6 +5,10 @@ # 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 7cf8fcac..31db6640 100644 --- a/src/fenrir/speechDriver/espeakDriver.py +++ b/src/fenrir/speechDriver/espeakDriver.py @@ -5,8 +5,12 @@ # 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 7fdd40d8..134d97d8 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 core import debug +from fenrir.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 99293a8f..e762cdd4 100644 --- a/src/fenrir/speechDriver/speechdDriver.py +++ b/src/fenrir/speechDriver/speechdDriver.py @@ -5,8 +5,12 @@ # 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 1dc9d266..0d3aa801 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 core import debug +from fenrir.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 7e6340f0..2ba20702 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 core import debug +from fenrir.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 d52b53f1..2867b9bb 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 core import debug +from fenrir.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 1bca1526..78c5edaa 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 core import debug +from fenrir.core import debug diff --git a/src/fenrir/utils/screen_utils.py b/src/fenrir/utils/screen_utils.py index 6a3db6ec..625bfbd4 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 core import debug +from fenrir.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 349b172a..40533dd9 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 core import debug +from fenrir.core import debug import string def getCurrentWord(currX,currY, currText):