Move cylc.parsec.LOG to cylc.LOG

cylc · Apr 30, 2019 · 82f6628 · 82f6628
1 parent 7620ed7
commit 82f6628
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 12 deletions.
diff --git a/lib/cylc/__init__.py b/lib/cylc/__init__.py
@@ -19,7 +19,12 @@
 
 import os
 import sys
-from cylc.parsec import LOG
+import logging
+
+
+LOG = logging.getLogger('cylc')  # Acceptable?
+if hasattr(logging, 'NullHandler'):  # Back compat Python <2.7
+    LOG.addHandler(logging.NullHandler())  # Start with a null handler
 
 
 def environ_init():

diff --git a/lib/cylc/parsec/__init__.py b/lib/cylc/parsec/__init__.py
@@ -16,10 +16,3 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """Parsec - library for parsing nested Cylc's INI-style configuration."""
-
-import logging
-
-
-LOG = logging.getLogger('cylc')  # Acceptable?
-if hasattr(logging, 'NullHandler'):  # Back compat Python <2.7
-    LOG.addHandler(logging.NullHandler())  # Start with a null handler
diff --git a/lib/cylc/parsec/fileparse.py b/lib/cylc/parsec/fileparse.py
@@ -36,7 +36,7 @@
 import sys
 import re
 
-from cylc.parsec import LOG
+from cylc import LOG
 from cylc.parsec.exceptions import ParsecError, FileParseError
 from cylc.parsec.OrderedDict import OrderedDictWithDefaults
 from cylc.parsec.include import inline

diff --git a/lib/cylc/parsec/jinja2support.py b/lib/cylc/parsec/jinja2support.py
@@ -35,7 +35,7 @@
     TemplateNotFound,
     TemplateSyntaxError)
 
-from cylc.parsec import LOG
+from cylc import LOG
 from cylc.parsec.exceptions import Jinja2Error
 
 

diff --git a/lib/cylc/parsec/upgrade.py b/lib/cylc/parsec/upgrade.py
@@ -19,7 +19,7 @@
 
 from logging import DEBUG, WARNING
 
-from cylc.parsec import LOG
+from cylc import LOG
 from cylc.parsec.exceptions import UpgradeError
 from cylc.parsec.OrderedDict import OrderedDict
 

diff --git a/lib/cylc/scheduler_cli.py b/lib/cylc/scheduler_cli.py
@@ -20,7 +20,6 @@
 import os
 import sys
 
-from cylc import LOG
 from cylc.cfgspec.glbl_cfg import glbl_cfg
 import cylc.flags
 from cylc.host_appointer import HostAppointer, EmptyHostList