[irods/irods#6294] allow genquery.py in centos-7 rpm

We might revert this on resolution of irods/irods#6294, as the syntax:

    func( **{ **a, **b } )

is a preferable and more direct expression of:

    func(**dict(list(a.items())+list(b.items())))

But currently this fix is necessary to test on Centos 7 due to Python2 syntax
requirements in the byte-compiling that happens when RPM packages are created.

Author: d-w-moore

genquery.py

@@ -157,7 +157,9 @@ def copy(self,**options):
         if incorrect:
             raise GenQuery_Options_Spec_Error('Incorrect option(s) to Query: '+', '.join(incorrect))
         # let `options' override but not duplicate `self.parameters' in the keyword argument list
-        return Query(self.callback, **{**self.parameters, **options})
+        keyword_items_list = list(self.parameters.items())  + list(options.items())
+        return Query(self.callback, **dict(keyword_items_list))
+        #return Query(self.callback, **{**self.parameters, **options})
 
     def exec_if_not_yet_execed(self):
         """Query execution is delayed until the first result or total row count is requested."""