From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 15 Jan 2021 04:34:11 +0000 (-0500)
Subject: fix double is_none()
X-Git-Tag: rel_1_4_0b2~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6be06d85e598e4fda6f3d35084e1c5cccb30cee5;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fix double is_none()

I added an extra is_none() by mistake the other day and for
some reason it sneaked past flake8.  it's breaking all the
builds so get it back in

Change-Id: I17b311341169571efa856e062c6be7e8f362618f
---

diff --git a/lib/sqlalchemy/testing/assertions.py b/lib/sqlalchemy/testing/assertions.py
index 40549f54c5..f2ed91b793 100644
--- a/lib/sqlalchemy/testing/assertions.py
+++ b/lib/sqlalchemy/testing/assertions.py
@@ -228,6 +228,10 @@ def is_none(a, msg=None):
     is_(a, None, msg=msg)
 
 
+def is_not_none(a, msg=None):
+    is_not(a, None, msg=msg)
+
+
 def is_true(a, msg=None):
     is_(bool(a), True, msg=msg)
 
@@ -236,14 +240,6 @@ def is_false(a, msg=None):
     is_(bool(a), False, msg=msg)
 
 
-def is_none(a, msg=None):
-    is_(a, None, msg=msg)
-
-
-def is_not_none(a, msg=None):
-    is_not(a, None, msg=msg)
-
-
 def is_(a, b, msg=None):
     """Assert a is b, with repr messaging on failure."""
     assert a is b, msg or "%r is not %r" % (a, b)