Skip to content

Commit fcb7165

Browse files
committed
fix logging level and formatting
1 parent 3949b31 commit fcb7165

File tree

2 files changed

+33
-4
lines changed

2 files changed

+33
-4
lines changed

pip_missing_reqs/find_missing_reqs.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,10 @@ def set_location(self, location):
3636
self.__location = location
3737

3838
def visit_Import(self, node):
39-
print('visit_Import', node)
4039
for alias in node.names:
4140
self.__addModule(alias.name, node.lineno)
4241

4342
def visit_ImportFrom(self, node):
44-
print('visit_ImportFrom', node)
4543
for alias in node.names:
4644
self.__addModule(node.module + '.' + alias.name, node.lineno)
4745

@@ -191,8 +189,8 @@ def ignore_files(filename, ignore_files=options.ignore_files):
191189

192190
options.paths = args or ['.']
193191

194-
logging.basicConfig(level=logging.INFO if options.verbose
195-
else logging.WARN)
192+
logging.basicConfig(format='%(message)s')
193+
log.setLevel(logging.INFO if options.verbose else logging.WARN)
196194

197195
for name, uses in find_missing_reqs(options):
198196
for use in uses:

pip_missing_reqs/test_find_missing_reqs.py

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,3 +227,34 @@ def parse_args(self):
227227

228228
for fn, matched in file_candidates:
229229
assert options.ignore_files(fn) == matched
230+
231+
232+
@pytest.mark.parametrize(["verbose_cfg", "events", "result"], [
233+
(False, [(logging.INFO, 'info'), (logging.WARN, 'warn')], ['warn']),
234+
(True, [(logging.INFO, 'info'), (logging.WARN, 'warn')], ['info', 'warn']),
235+
])
236+
def test_logging_config(monkeypatch, caplog, verbose_cfg, events, result):
237+
class options:
238+
paths = ['dummy']
239+
verbose = verbose_cfg
240+
ignore_files = []
241+
ignore_mods = []
242+
options = options()
243+
244+
class FakeOptParse:
245+
def add_option(*args, **kw):
246+
pass
247+
248+
def parse_args(self):
249+
return [options, 'ham.py']
250+
251+
monkeypatch.setattr(optparse, 'OptionParser', FakeOptParse)
252+
253+
monkeypatch.setattr(find_missing_reqs, 'find_missing_reqs', lambda x: [])
254+
find_missing_reqs.main()
255+
256+
for event in events:
257+
find_missing_reqs.log.log(*event)
258+
259+
messages = [r.message for r in caplog.records()]
260+
assert messages == result

0 commit comments

Comments
 (0)