- ensure rowcount is returned for an UPDATE with no implicit returning

- modernize test for that
- use py3k compatible next() in test_returning/test_versioning

1 files changed, 4 insertions, 5 deletions

diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index 257eaa18a..735113a26 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -898,11 +898,10 @@ class Connection(Connectable):
             elif not context._is_explicit_returning:
                 result.close(_autoclose_connection=False)
                 result._metadata = None
-        elif context.isupdate:
-            if context._is_implicit_returning:
-                context._fetch_implicit_update_returning(result)
-                result.close(_autoclose_connection=False)
-                result._metadata = None
+        elif context.isupdate and context._is_implicit_returning:
+            context._fetch_implicit_update_returning(result)
+            result.close(_autoclose_connection=False)
+            result._metadata = None
 
         elif result._metadata is None:
             # no results, get rowcount