Backport #47219 fixes Python 3.7 bugs

* Resolve invalid-unary-operand-type.

* Resolve stop-iteration-return.

(cherry-picked from c24c19594e)

changelogs/fragments/py37_misc_module_backports.yaml

@@ -0,0 +1,6 @@
+bugfixes:
+- consul_kv - minor error-handling bugfix under Python 3.7 (https://github.com/ansible/ansible/pull/47219)
+- cnos_backup - fixed syntax error (https://github.com/ansible/ansible/pull/47219)
+- cnos_image - fixed syntax error (https://github.com/ansible/ansible/pull/47219)
+- apt_repository - fixed failure under Python 3.7 (https://github.com/ansible/ansible/pull/47219)
+- netapp_e_storagepool - fixed failure under Python 3.7 (https://github.com/ansible/ansible/pull/47219)

lib/ansible/modules/clustering/consul_kv.py

@@ -233,7 +233,7 @@ def set_value(module):
     value = module.params.get('value')
 
     if value is NOT_SET:
-        raise AssertionError('Cannot set value of "%s" to `NOT_SET`', (key, ))
+        raise AssertionError('Cannot set value of "%s" to `NOT_SET`' % key)
 
     index, changed = _has_value_changed(consul_api, key, value)
 

lib/ansible/modules/network/cnos/cnos_backup.py

@@ -213,7 +213,7 @@ def doConfigBackUp(module, prompt, answer):
     elif(protocol == "tftp"):
         command = "copy " + configType + " " + protocol + " " + protocol
         command = command + "://" + server + "/" + confPath
-        command = command + + " vrf management\n"
+        command = command + " vrf management\n"
         # cnos.debugOutput(command)
         tftp_cmd = [{'command': command, 'prompt': None, 'answer': None}]
         cmd.extend(tftp_cmd)

lib/ansible/modules/network/cnos/cnos_image.py

@@ -175,7 +175,7 @@ def doImageDownload(module, prompt, answer):
     elif(protocol == "tftp"):
         command = "copy " + protocol + " " + protocol + "://" + server
         command = command + "/" + imgPath + " system-image " + imgType
-        command = command + + " vrf management"
+        command = command + " vrf management"
         prompt = ['Confirm download operation',
                   'Do you want to change that to the standby image']
         answer = ['y', 'y']

lib/ansible/modules/packaging/os/apt_repository.py

@@ -184,7 +184,6 @@ class SourcesList(object):
             for n, valid, enabled, source, comment in sources:
                 if valid:
                     yield file, n, enabled, source, comment
-        raise StopIteration
 
     def _expand_path(self, filename):
         if '/' in filename:

lib/ansible/modules/storage/netapp/netapp_e_storagepool.py

@@ -145,7 +145,10 @@ class GroupBy(object):
     def _grouper(self, tgtkey):
         while self.currkey == tgtkey:
             yield self.currvalue
+            try:
                 self.currvalue = next(self.it)  # Exit on StopIteration
+            except StopIteration:
+                return
             self.currkey = self.keyfunc(self.currvalue)