From 4f974768f460db3d938ba5aad443098e2e2cb96e Mon Sep 17 00:00:00 2001
From: David Euresti <david@euresti.com>
Date: Sat, 22 Aug 2020 20:23:30 -0700
Subject: [PATCH 1/2] Fix auto_attrib=None behavior when maybe_cls=None

---
 src/attr/_next_gen.py  | 25 +++++++++++++++++--------
 tests/test_next_gen.py | 25 +++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/src/attr/_next_gen.py b/src/attr/_next_gen.py
index 57e8635b1..0e3c365f3 100644
--- a/src/attr/_next_gen.py
+++ b/src/attr/_next_gen.py
@@ -50,9 +50,9 @@ def define(
     .. versionadded:: 20.1.0
     """
 
-    def do_it(auto_attribs):
+    def do_it(cls, auto_attribs):
         return attrs(
-            maybe_cls=maybe_cls,
+            maybe_cls=cls,
             these=these,
             repr=repr,
             hash=hash,
@@ -74,12 +74,21 @@ def do_it(auto_attribs):
         )
 
     if auto_attribs is not None:
-        return do_it(auto_attribs)
-
-    try:
-        return do_it(True)
-    except UnannotatedAttributeError:
-        return do_it(False)
+        return do_it(maybe_cls, auto_attribs)
+
+    def wrap(cls):
+        # Making this a wrapper ensures this code runs during class creation.
+        try:
+            return do_it(cls, True)
+        except UnannotatedAttributeError:
+            return do_it(cls, False)
+
+    # maybe_cls's type depends on the usage of the decorator.  It's a class
+    # if it's used as `@attrs` but ``None`` if used as `@attrs()`.
+    if maybe_cls is None:
+        return wrap
+    else:
+        return wrap(maybe_cls)
 
 
 mutable = define
diff --git a/tests/test_next_gen.py b/tests/test_next_gen.py
index a4460b192..f4678250c 100644
--- a/tests/test_next_gen.py
+++ b/tests/test_next_gen.py
@@ -101,6 +101,31 @@ class OldSchool:
 
         assert OldSchool(1) == OldSchool(1)
 
+        # Test with maybe_cls = None
+        @attr.define()
+        class OldSchool2:
+            x = attr.field()
+
+        assert OldSchool2(1) == OldSchool2(1)
+
+    def test_auto_attribs_detect_annotations(self):
+        """
+        define correctly detects if a class lacks type annotations.
+        """
+
+        @attr.define
+        class NewSchool:
+            x: int
+
+        assert NewSchool(1) == NewSchool(1)
+
+        # Test with maybe_cls = None
+        @attr.define()
+        class NewSchool2:
+            x: int
+
+        assert NewSchool2(1) == NewSchool2(1)
+
     def test_exception(self):
         """
         Exceptions are detected and correctly handled.

From 9bbc22905bf369a6f730595139666130ee8eab7d Mon Sep 17 00:00:00 2001
From: Hynek Schlawack <hs@ox.cx>
Date: Sun, 23 Aug 2020 07:47:24 +0200
Subject: [PATCH 2/2] Update tests/test_next_gen.py

Co-authored-by: David Euresti <github@euresti.com>
---
 tests/test_next_gen.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_next_gen.py b/tests/test_next_gen.py
index f4678250c..1ed0108ad 100644
--- a/tests/test_next_gen.py
+++ b/tests/test_next_gen.py
@@ -110,7 +110,7 @@ class OldSchool2:
 
     def test_auto_attribs_detect_annotations(self):
         """
-        define correctly detects if a class lacks type annotations.
+        define correctly detects if a class has type annotations.
         """
 
         @attr.define