move all modules to /uberwriter

.gitignore

@@ -20,3 +20,4 @@ data/ui/shortcut_handlers
 .vscode/
 *.glade~
 dist/uberwriter-2.0b0-py3.7.egg
+builddir/*

setup.py

@@ -60,10 +60,10 @@ setup(
         # "": '/opt/uberwriter/'
     },
     packages=[
-        "uberwriter_lib.gtkspellcheck",
-        "uberwriter_lib.pylocales",
-        # "uberwriter_lib.pressagio",
-        "uberwriter_lib",
+        "uberwriter.gtkspellcheck",
+        "uberwriter.pylocales",
+        # "uberwriter.pressagio",
+        "uberwriter",
         "uberwriter",
         "po"
         # "uberwriter.plugins"
@@ -72,7 +72,7 @@ setup(
     include_package_data=True,
 
     package_data={
-        'uberwriter_lib.pylocales' : ['locales.db'],
+        'uberwriter.pylocales' : ['locales.db'],
     },
     data_files=[
         (app_prefix + 'bin', ['bin/uberwriter']),

uberwriter/.pylintrc

@@ -60,7 +60,7 @@ confidence=
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use "--disable=all --enable=classes
 # --disable=W".
-# disable=print-statement,
+disable=print-statement,
         parameter-unpacking,
         unpacking-in-except,
         old-raise-syntax,

uberwriter/AppWindow.py

@@ -23,9 +23,9 @@ from gi.repository import GLib, Gio, Gtk, Gdk, GdkPixbuf
 
 from uberwriter import UberwriterWindow
 from uberwriter.Settings import Settings
-from uberwriter_lib import set_up_logging
-from uberwriter_lib.PreferencesDialog import PreferencesDialog
-from . helpers import get_builder, get_media_path
+from uberwriter.helpers import set_up_logging
+from uberwriter.PreferencesDialog import PreferencesDialog
+from uberwriter.helpers import get_builder, get_media_path
 
 
 class Application(Gtk.Application):
@@ -181,7 +181,7 @@ class Application(Gtk.Application):
         parser = argparse.ArgumentParser()
         parser.add_argument(
             "-v", "--verbose", action="count", dest="verbose",
-            help=_("Show debug messages (-vv debugs uberwriter_lib also)"))
+            help=_("Show debug messages (-vv debugs uberwriter also)"))
         parser.add_argument(
             "-e", "--experimental-features", help=_("Use experimental features"),
             action='store_true'

uberwriter/Builder.py

@@ -28,7 +28,7 @@ import gi
 gi.require_version('Gtk', '3.0') # pylint: disable=wrong-import-position
 from gi.repository import GObject, Gtk  # pylint: disable=E0611
 
-LOGGER = logging.getLogger('uberwriter_lib')
+LOGGER = logging.getLogger('uberwriter')
 
 # this module is big so uses some conventional prefixes and postfixes
 # *s list, except self.widgets is a dictionary

uberwriter/FormatShortcuts.py

@@ -17,7 +17,7 @@
 
 from gettext import gettext as _
 
-from . MarkupBuffer import MarkupBuffer
+from uberwriter.MarkupBuffer import MarkupBuffer
 
 
 class FormatShortcuts():

uberwriter/PreferencesDialog.py

@@ -22,9 +22,9 @@ import gi
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk # pylint: disable=E0611
 import logging
-logger = logging.getLogger('uberwriter_lib')
+logger = logging.getLogger('uberwriter')
 
-from . helpers import get_builder, show_uri, get_help_uri
+from uberwriter.helpers import get_builder, show_uri, get_help_uri
 
 class PreferencesDialog(Gtk.Window):
     __gtype_name__ = "PreferencesDialog"

uberwriter/Theme.py

@@ -1,7 +1,7 @@
 from gi.repository import Gtk
 
 from uberwriter.Settings import Settings
-from uberwriter_lib.helpers import get_css_path
+from uberwriter.helpers import get_css_path
 
 
 class Theme:

uberwriter/UberwriterAutoCorrect.py

@@ -13,16 +13,16 @@ from gi.repository import Gtk, Gdk
 
 import enchant
 
-from uberwriter_lib import pressagio
-# import uberwriter_lib.pressagio.predictor
-# import uberwriter_lib.pressagio.tokenizer
-# import uberwriter_lib.pressagio.dbconnector
-# import uberwriter_lib.pressagio.context_tracker
-# import uberwriter_lib.pressagio.callback
+from uberwriter import pressagio
+# import uberwriter.pressagio.predictor
+# import uberwriter.pressagio.tokenizer
+# import uberwriter.pressagio.dbconnector
+# import uberwriter.pressagio.context_tracker
+# import uberwriter.pressagio.callback
 
 # from Levenshtein import distance
 
-from uberwriter_lib.helpers import get_media_path
+from uberwriter.helpers import get_media_path
 
 # Define and create PresageCallback object
 class PressagioCallback(pressagio.callback.Callback):

uberwriter/UberwriterExportDialog.py

@@ -30,8 +30,8 @@ from uberwriter.Theme import Theme
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
 
-from uberwriter_lib import helpers
-from uberwriter_lib.helpers import get_builder
+from uberwriter import helpers
+from uberwriter.helpers import get_builder
 
 LOGGER = logging.getLogger('uberwriter')
 

uberwriter/UberwriterInlinePreview.py

@@ -29,7 +29,7 @@ from gettext import gettext as _
 import gi
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk, Gdk, GdkPixbuf, GObject
-from uberwriter_lib import LatexToPNG
+from uberwriter import LatexToPNG
 from .Settings import Settings
 
 from .FixTable import FixTable

uberwriter/UberwriterWindow.py

@@ -39,10 +39,10 @@ from gi.repository import Pango  # pylint: disable=E0611
 import cairo
 # import cairo.Pattern, cairo.SolidPattern
 
-from . import headerbars
-from uberwriter_lib import helpers
-from uberwriter_lib.helpers import get_builder
-from uberwriter_lib.gtkspellcheck import SpellChecker
+from uberwriter import headerbars
+from uberwriter import helpers
+from uberwriter.helpers import get_builder
+from uberwriter.gtkspellcheck import SpellChecker
 
 from .MarkupBuffer import MarkupBuffer
 from .UberwriterTextEditor import TextEditor

uberwriter/__init__.py

@@ -25,8 +25,11 @@ import gi
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk # pylint: disable=E0611
 
-from . import UberwriterWindow
-from uberwriter_lib import AppWindow
+from uberwriter import UberwriterWindow
+from uberwriter import AppWindow
+from uberwriter.helpers import set_up_logging
+from uberwriter.uberwriterconfig import get_version
+
 
 def main():
     'constructor for your class instances'

uberwriter/gtkspellcheck/spellcheck.py

@@ -29,8 +29,8 @@ import logging
 import re
 import sys
 
-from uberwriter_lib.pylocales import code_to_name as _code_to_name
-from uberwriter_lib.pylocales import LanguageNotFound, CountryNotFound
+from uberwriter.pylocales import code_to_name as _code_to_name
+from uberwriter.pylocales import LanguageNotFound, CountryNotFound
 
 # public objects
 __all__ = ['SpellChecker', 'NoDictionariesFound', 'NoGtkBindingFound']

uberwriter/headerbars.py

@@ -22,10 +22,10 @@ from gettext import gettext as _
 import gi
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
-from uberwriter_lib.helpers import get_builder
-from uberwriter_lib.helpers import get_descendant
+from uberwriter.helpers import get_builder
+from uberwriter.helpers import get_descendant
 
-from uberwriter_lib.AppWindow import Application as app
+from uberwriter.AppWindow import Application as app
 
 class MainHeaderbar:  #pylint: disable=too-few-public-methods
     """Sets up the main application headerbar

uberwriter/helpers.py

@@ -26,8 +26,8 @@ import gi
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk  # pylint: disable=E0611
 
-from . uberwriterconfig import get_data_file
-from . Builder import Builder
+from uberwriter.uberwriterconfig import get_data_file
+from uberwriter.Builder import Builder
 
 
 def get_builder(builder_file_name):
@@ -103,7 +103,7 @@ def set_up_logging(opts):
     logger_sh.setFormatter(formatter)
     logger.addHandler(logger_sh)
 
-    lib_logger = logging.getLogger('uberwriter_lib')
+    lib_logger = logging.getLogger('uberwriter')
     lib_logger_sh = logging.StreamHandler()
     lib_logger_sh.setFormatter(formatter)
     lib_logger.addHandler(lib_logger_sh)

uberwriter/uberwriterconfig.py

@@ -47,7 +47,7 @@ def get_data_file(*path_segments):
 def get_data_path():
     """Retrieve uberwriter data path
 
-    This path is by default <uberwriter_lib_path>/../data/ in trunk
+    This path is by default <uberwriter_path>/../data/ in trunk
     and /opt/uberwriter/data in an installed version but this path
     is specified at installation time.
     """

uberwriter_lib/.pylintrc

@@ -60,7 +60,7 @@ confidence=
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use "--disable=all --enable=classes
 # --disable=W".
-# disable=print-statement,
+disable=print-statement,
         parameter-unpacking,
         unpacking-in-except,
         old-raise-syntax,

uberwriter_lib/__init__.py

@@ -16,9 +16,9 @@
 
 ### DO NOT EDIT THIS FILE ###
 
-'''facade - makes uberwriter_lib package easy to refactor
+'''facade - makes uberwriter package easy to refactor
 
 while keeping its api constant'''
-from . helpers import set_up_logging
-# from . AppWindow import Window
-from . uberwriterconfig import get_version
+from uberwriter.helpers import set_up_logging
+# from uberwriter.AppWindow import Window
+from uberwriter.uberwriterconfig import get_version