Skip to content

Commit 5d13229

Browse files
committed
do not import iflogger from base plugin
1 parent 1bccef7 commit 5d13229

File tree

6 files changed

+19
-10
lines changed

6 files changed

+19
-10
lines changed

nipype/pipeline/plugins/condor.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
from time import sleep
88

99
from ...interfaces.base import CommandLine
10-
from .base import (SGELikeBatchManagerBase, logger, iflogger, logging)
11-
10+
from ... import logging
11+
from .base import (SGELikeBatchManagerBase, logger, logging)
12+
iflogger = logging.getLogger('interface')
1213

1314
class CondorPlugin(SGELikeBatchManagerBase):
1415
"""Execute using Condor

nipype/pipeline/plugins/lsf.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
import re
88
from time import sleep
99

10-
from .base import (SGELikeBatchManagerBase, logger, iflogger, logging)
10+
from .base import (SGELikeBatchManagerBase, logger, logging)
11+
from ... import logging
1112
from ...interfaces.base import CommandLine
12-
13+
iflogger = logging.getLogger('interface')
1314

1415
class LSFPlugin(SGELikeBatchManagerBase):
1516
"""Execute using LSF Cluster Submission

nipype/pipeline/plugins/oar.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010
import subprocess
1111
import simplejson as json
1212

13-
from .base import (SGELikeBatchManagerBase, logger, iflogger, logging)
13+
from .base import (SGELikeBatchManagerBase, logger, logging)
14+
from ... import logging
1415
from ...interfaces.base import CommandLine
15-
16+
iflogger = logging.getLogger('interface')
1617

1718
class OARPlugin(SGELikeBatchManagerBase):
1819
"""Execute using OAR

nipype/pipeline/plugins/pbs.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88
from time import sleep
99

1010
from ...interfaces.base import CommandLine
11-
from .base import (SGELikeBatchManagerBase, logger, iflogger, logging)
11+
from ... import logging
12+
from .base import (SGELikeBatchManagerBase, logger, logging)
1213

14+
iflogger = logging.getLogger('interface')
1315

1416

1517
class PBSPlugin(SGELikeBatchManagerBase):

nipype/pipeline/plugins/sge.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@
1515

1616
import random
1717

18+
from ... import logging
1819
from ...interfaces.base import CommandLine
19-
from .base import (SGELikeBatchManagerBase, logger, iflogger, logging)
20-
20+
from .base import (SGELikeBatchManagerBase, logger, logging)
21+
iflogger = logging.getLogger('interface')
2122
DEBUGGING_PREFIX = str(int(random.uniform(100, 999)))
2223

2324

nipype/pipeline/plugins/slurm.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@
1212
import re
1313
from time import sleep
1414

15+
from ... import logging
1516
from ...interfaces.base import CommandLine
16-
from .base import (SGELikeBatchManagerBase, logger, iflogger, logging)
17+
from .base import (SGELikeBatchManagerBase, logger, logging)
18+
19+
iflogger = logging.getLogger('interface')
1720

1821

1922

0 commit comments

Comments
 (0)