Skip to content

Commit f28bdbd

Browse files
authored
Merge pull request #1336 from mrvisscher/its_the_final_logger
Logging changes
2 parents 8e1d44c + 1f6a3f8 commit f28bdbd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+230
-184
lines changed

activity_browser/__init__.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# -*- coding: utf-8 -*-
22
import sys
3+
from logging import getLogger
34

45

5-
from .logger import exception_hook, log, log_file_location
6+
from .logger import log_file_location, setup_ab_logging
67
from .mod import bw2data
78
from .application import application
89
from .signals import signals
@@ -12,6 +13,8 @@
1213
from .plugin import Plugin
1314
from .controllers import *
1415

16+
log = getLogger(__name__)
17+
1518

1619
def load_settings() -> None:
1720
if ab_settings.settings:
@@ -22,6 +25,7 @@ def load_settings() -> None:
2225

2326

2427
def run_activity_browser():
28+
setup_ab_logging()
2529
log.info(f"Activity Browser version: {version}")
2630
if log_file_location:
2731
log.info(f"The log file can be found at {log_file_location}")

activity_browser/actions/calculation_setup/cs_delete.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
import traceback
1+
from logging import getLogger
22

33
from PySide2 import QtWidgets
44

5-
from activity_browser import application, log, signals
5+
from activity_browser import application, signals
66
from activity_browser.actions.base import ABAction, exception_dialogs
77
from activity_browser.mod import bw2data as bd
88
from activity_browser.ui.icons import qicons
99

10+
log = getLogger(__name__)
11+
1012

1113
class CSDelete(ABAction):
1214
"""

activity_browser/actions/calculation_setup/cs_duplicate.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
from typing import Callable, Union
1+
from logging import getLogger
22

3-
from PySide2 import QtCore, QtWidgets
3+
from PySide2 import QtWidgets
44

5-
from activity_browser import application, log, signals
5+
from activity_browser import application, signals
66
from activity_browser.actions.base import ABAction, exception_dialogs
77
from activity_browser.mod import bw2data as bd
88
from activity_browser.ui.icons import qicons
99

10+
log = getLogger(__name__)
11+
1012

1113
class CSDuplicate(ABAction):
1214
"""

activity_browser/actions/calculation_setup/cs_new.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1+
from logging import getLogger
2+
13
from PySide2 import QtWidgets
24

3-
from activity_browser import application, log, signals
5+
from activity_browser import application, signals
46
from activity_browser.actions.base import ABAction, exception_dialogs
57
from activity_browser.mod import bw2data as bd
68
from activity_browser.ui.icons import qicons
79

10+
log = getLogger(__name__)
11+
812

913
class CSNew(ABAction):
1014
"""

activity_browser/actions/calculation_setup/cs_rename.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1+
from logging import getLogger
2+
13
from PySide2 import QtWidgets
24

3-
from activity_browser import application, log, signals
5+
from activity_browser import application, signals
46
from activity_browser.actions.base import ABAction, exception_dialogs
57
from activity_browser.mod import bw2data as bd
68
from activity_browser.ui.icons import qicons
79

10+
log = getLogger(__name__)
11+
812

913
class CSRename(ABAction):
1014
"""

activity_browser/actions/method/method_delete.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
from typing import List
2+
from logging import getLogger
23

34
from PySide2 import QtWidgets
45

5-
from activity_browser import application, log
6+
from activity_browser import application
67
from activity_browser.actions.base import ABAction, exception_dialogs
78
from activity_browser.mod import bw2data as bd
89
from activity_browser.ui.icons import qicons
910

11+
log = getLogger(__name__)
12+
1013

1114
class MethodDelete(ABAction):
1215
"""

activity_browser/actions/method/method_duplicate.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
from typing import List
2+
from logging import getLogger
23

3-
from activity_browser import application, log
4+
from activity_browser import application
45
from activity_browser.actions.base import ABAction, exception_dialogs
56
from activity_browser.mod import bw2data as bd
67
from activity_browser.ui.icons import qicons
78
from activity_browser.ui.widgets import TupleNameDialog
89

10+
log = getLogger(__name__)
11+
912

1013
class MethodDuplicate(ABAction):
1114
"""

activity_browser/actions/project/project_export.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
import os
22
import json
33
import tarfile
4+
from logging import getLogger
45

56
from PySide2 import QtWidgets, QtCore
67

7-
from activity_browser import application, log
8+
from activity_browser import application
89
from activity_browser.mod import bw2data as bd
910
from activity_browser.actions.base import ABAction, exception_dialogs
1011
from activity_browser.ui.threading import ABThread
1112

13+
log = getLogger(__name__)
14+
1215

1316
class ProjectExport(ABAction):
1417
"""

activity_browser/actions/project/project_import.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
import os
21
import codecs
32
import json
43
import tarfile
4+
from logging import getLogger
55

66
from PySide2 import QtWidgets, QtCore
77
from bw2io import backup
88

9-
from activity_browser import application, log
9+
from activity_browser import application
1010
from activity_browser.mod import bw2data as bd
1111
from activity_browser.actions.base import ABAction, exception_dialogs
1212
from activity_browser.ui.icons import qicons
1313
from activity_browser.ui.threading import ABThread
1414

15+
log = getLogger(__name__)
16+
1517

1618
class ProjectImport(ABAction):
1719
"""

activity_browser/actions/project/project_switch.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
from activity_browser import log
1+
from logging import getLogger
2+
23
from activity_browser.actions.base import ABAction, exception_dialogs
34
from activity_browser.mod import bw2data as bd
45

6+
log = getLogger(__name__)
7+
58

69
class ProjectSwitch(ABAction):
710
"""

0 commit comments

Comments
 (0)