From f680c5b83e65413eeb684c68ece60198015058c3 Mon Sep 17 00:00:00 2001
From: Hynek Schlawack <hs@ox.cx>
Date: Tue, 1 Sep 2020 09:56:52 +0200
Subject: [PATCH] pre-commit autoupdate

Latest black required to remove a bunch of commas to prevent line explosion.
---
 .pre-commit-config.yaml |  6 +++---
 pyproject.toml          |  1 -
 src/attr/_compat.py     |  3 ++-
 src/attr/_make.py       | 12 ++++++------
 tests/test_dunders.py   |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index c2f0dcd64..d91d6af76 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
 ---
 repos:
   - repo: https://github.com/psf/black
-    rev: 19.10b0
+    rev: 20.8b1
     hooks:
       - id: black
         language_version: python3.8
@@ -15,7 +15,7 @@ repos:
       - id: seed-isort-config
 
   - repo: https://github.com/pre-commit/mirrors-isort
-    rev: v4.3.21
+    rev: v5.4.2
     hooks:
       - id: isort
         additional_dependencies: [toml]
@@ -34,7 +34,7 @@ repos:
         language_version: python3.8
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.1.0
+    rev: v3.2.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
diff --git a/pyproject.toml b/pyproject.toml
index ae315ea00..a3f207904 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -32,7 +32,6 @@ include_trailing_comma=true
 lines_after_imports=2
 lines_between_types=1
 multi_line_output=3
-not_skip="__init__.py"
 use_parentheses=true
 
 known_first_party="attr"
diff --git a/src/attr/_compat.py b/src/attr/_compat.py
index a915db8eb..bed5b1357 100644
--- a/src/attr/_compat.py
+++ b/src/attr/_compat.py
@@ -19,9 +19,10 @@
 
 
 if PY2:
-    from UserDict import IterableUserDict
     from collections import Mapping, Sequence
 
+    from UserDict import IterableUserDict
+
     # We 'bundle' isclass instead of using inspect as importing inspect is
     # fairly expensive (order of 10-15 ms for a modern machine in 2016)
     def isclass(klass):
diff --git a/src/attr/_make.py b/src/attr/_make.py
index 1e6b4bdc8..be7cbd8bf 100644
--- a/src/attr/_make.py
+++ b/src/attr/_make.py
@@ -575,7 +575,7 @@ def __init__(
         has_custom_setattr,
     ):
         attrs, base_attrs, base_map = _transform_attrs(
-            cls, these, auto_attribs, kw_only, collect_by_mro,
+            cls, these, auto_attribs, kw_only, collect_by_mro
         )
 
         self._cls = cls
@@ -1857,7 +1857,7 @@ def _setattr(attr_name, value_var, has_on_setattr):
     """
     Use the cached object.setattr to set *attr_name* to *value_var*.
     """
-    return "_setattr('%s', %s)" % (attr_name, value_var,)
+    return "_setattr('%s', %s)" % (attr_name, value_var)
 
 
 def _setattr_with_converter(attr_name, value_var, has_on_setattr):
@@ -1880,7 +1880,7 @@ def _assign(attr_name, value, has_on_setattr):
     if has_on_setattr:
         return _setattr(attr_name, value, True)
 
-    return "self.%s = %s" % (attr_name, value,)
+    return "self.%s = %s" % (attr_name, value)
 
 
 def _assign_with_converter(attr_name, value_var, has_on_setattr):
@@ -1941,7 +1941,7 @@ def fmt_setter(attr_name, value_var, has_on_setattr):
                 if _is_slot_attr(attr_name, base_attr_map):
                     return _setattr(attr_name, value_var, has_on_setattr)
 
-                return "_inst_dict['%s'] = %s" % (attr_name, value_var,)
+                return "_inst_dict['%s'] = %s" % (attr_name, value_var)
 
             def fmt_setter_with_converter(
                 attr_name, value_var, has_on_setattr
@@ -2029,7 +2029,7 @@ def fmt_setter_with_converter(
                         )
                     )
         elif a.default is not NOTHING and not has_factory:
-            arg = "%s=attr_dict['%s'].default" % (arg_name, attr_name,)
+            arg = "%s=attr_dict['%s'].default" % (arg_name, attr_name)
             if a.kw_only:
                 kw_only_args.append(arg)
             else:
@@ -2038,7 +2038,7 @@ def fmt_setter_with_converter(
             if a.converter is not None:
                 lines.append(
                     fmt_setter_with_converter(
-                        attr_name, arg_name, has_on_setattr,
+                        attr_name, arg_name, has_on_setattr
                     )
                 )
                 names_for_globals[
diff --git a/tests/test_dunders.py b/tests/test_dunders.py
index 391592ef6..2f1ebabdd 100644
--- a/tests/test_dunders.py
+++ b/tests/test_dunders.py
@@ -528,7 +528,7 @@ def test_copy_hash_cleared(self, cache_hash, frozen, slots):
         Test that the default hash is recalculated after a copy operation.
         """
 
-        kwargs = dict(frozen=frozen, slots=slots, cache_hash=cache_hash,)
+        kwargs = dict(frozen=frozen, slots=slots, cache_hash=cache_hash)
 
         # Give it an explicit hash if we don't have an implicit one
         if not frozen: