Merge branch 'bertsky-adapt-ocrd-logging-2-17'

hnesk · Oct 12, 2020 · 56382e1 · 56382e1
2 parents fd02515 + 49d37ba
commit 56382e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ocrd_browser/model/document.py b/ocrd_browser/model/document.py
@@ -7,10 +7,11 @@
 from ocrd_models import OcrdFile
 from ocrd_models.ocrd_page_generateds import PcGtsType
 from ocrd_models.constants import NAMESPACES as NS
-from ocrd_utils import pushd_popd, getLogger
+from ocrd_utils import pushd_popd
 from ocrd_utils.constants import MIME_TO_EXT, MIMETYPE_PAGE
 from . import DEFAULT_FILE_GROUP
 
+from logging import getLogger
 from typing import Optional, Tuple, List, Set, Union, cast, Callable, Any
 from collections import OrderedDict
 from pathlib import Path

diff --git a/ocrd_browser/ui/window.py b/ocrd_browser/ui/window.py
@@ -1,5 +1,6 @@
 from gi.repository import Gtk, GdkPixbuf, Gio, GObject, GLib
 from ocrd_models import OcrdFile
+from ocrd_utils import initLogging
 
 from ocrd_browser.model import Document
 from ocrd_browser.view import ViewRegistry, View, ViewImages
@@ -23,6 +24,7 @@ class MainWindow(Gtk.ApplicationWindow):
 
     def __init__(self, **kwargs: Any):
         Gtk.ApplicationWindow.__init__(self, **kwargs)
+        initLogging()
         # noinspection PyCallByClass,PyArgumentList
         self.set_icon(GdkPixbuf.Pixbuf.new_from_resource("/org/readmachine/ocrd-browser/icons/icon.png"))
         self.views: List[View] = []