Skip to content

Commit

Permalink
Merge ffc4346 into 21ab37a
Browse files Browse the repository at this point in the history
  • Loading branch information
apljungquist committed Mar 5, 2019
2 parents 21ab37a + ffc4346 commit c3f9f0f
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 3 deletions.
2 changes: 2 additions & 0 deletions README.md
Expand Up @@ -939,6 +939,8 @@ More details can be found in [CONTRIBUTING](CONTRIBUTING.md).

### 19.2b0

* removed calls to root logger (#715)

* removed `--py36` (use `--target-version=cpy36` instead) (#724)

* long `del` statements are now split into multiple lines (#698)
Expand Down
4 changes: 2 additions & 2 deletions blib2to3/pgen2/driver.py
Expand Up @@ -32,7 +32,7 @@ class Driver(object):
def __init__(self, grammar, convert=None, logger=None):
self.grammar = grammar
if logger is None:
logger = logging.getLogger()
logger = logging.getLogger(__name__)
self.logger = logger
self.convert = convert

Expand Down Expand Up @@ -157,7 +157,7 @@ def load_grammar(gt="Grammar.txt", gp=None,
save=True, force=False, logger=None):
"""Load the grammar (maybe from a pickle)."""
if logger is None:
logger = logging.getLogger()
logger = logging.getLogger(__name__)
gp = _generate_pickle_name(gt) if gp is None else gp
if force or not _newer(gp, gt):
logger.info("Generating grammar tables from %s", gt)
Expand Down
17 changes: 16 additions & 1 deletion tests/test_black.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python3
import asyncio
import logging
from concurrent.futures import ThreadPoolExecutor
from contextlib import contextmanager, redirect_stderr
from functools import partial, wraps
Expand Down Expand Up @@ -37,7 +38,6 @@
else:
has_blackd_deps = True


ff = partial(black.format_file_in_place, mode=black.FileMode(), fast=True)
fs = partial(black.format_str, mode=black.FileMode())
THIS_FILE = Path(__file__)
Expand Down Expand Up @@ -1356,6 +1356,21 @@ def test_shhh_click(self) -> None:
except RuntimeError as re:
self.fail(f"`patch_click()` failed, exception still raised: {re}")

def test_root_logger_not_used_directly(self) -> None:
def fail(*args: Any, **kwargs: Any) -> None:
self.fail("Record created with root logger")

with patch.multiple(
logging.root,
debug=fail,
info=fail,
warning=fail,
error=fail,
critical=fail,
log=fail,
):
ff(THIS_FILE)

@unittest.skipUnless(has_blackd_deps, "blackd's dependencies are not installed")
@async_test
async def test_blackd_request_needs_formatting(self) -> None:
Expand Down

0 comments on commit c3f9f0f

Please sign in to comment.