2 files changed, 4 insertions, 3 deletions
diff --git a/pep8.py b/pep8.py
index ec19dc5..8ec21e1 100755
--- a/pep8.py
+++ b/pep8.py
@@ -794,9 +794,9 @@ def whitespace_around_named_parameter_equals(logical_line, tokens):
             if start != prev_end:
                 yield (prev_end, message)
         if token_type == tokenize.OP:
-            if text == '(':
+            if text in '([':
                 parens += 1
-            elif text == ')':
+            elif text in ')]':
                 parens -= 1
             elif in_def and text == ':' and parens == 1:
                 annotated_func_arg = True
diff --git a/testsuite/E25.py b/testsuite/E25.py
index ad8db88..7d00310 100644
--- a/testsuite/E25.py
+++ b/testsuite/E25.py
@@ -32,5 +32,6 @@ d[type(None)] = _deepcopy_atomic
 
 # Annotated Function Definitions
 #: Okay
-def munge(input: AnyStr, sep: AnyStr = None, limit=1000) -> AnyStr:
+def munge(input: AnyStr, sep: AnyStr = None, limit=1000,
+          extra: Union[str, dict] = None) -> AnyStr:
     pass