Make use of dict unions

Author: Cito

webware/MiscUtils/DictForArgs.py

@@ -193,11 +193,10 @@ def expandDictWithExtras(d, key='Extras',
     to specify attributes that occur infrequently.
     """
     if key in d:
-        newDict = dict(d)
+        baseDict = dict(d)
         if delKey:
-            del newDict[key]
-        newDict.update(dictForArgs(d[key]))
-        return newDict
+            del baseDict[key]
+        return baseDict | dictForArgs(d[key])
     return d
 
 

webware/WebUtils/CGITraceback.py

@@ -37,8 +37,7 @@ def breaker():
 
 def html(context=5, options=None):
     if options:
-        opt = DefaultOptions.copy()
-        opt.update(options)
+        opt = DefaultOptions | options
     else:
         opt = DefaultOptions
 

webware/WebUtils/ExpansiveHTMLForException.py

@@ -17,8 +17,7 @@
 def expansiveHTMLForException(context=5, options=None):
     """Create expansive HTML for exceptions."""
     if options:
-        opt = HTMLForExceptionOptions.copy()
-        opt.update(options)
+        opt = HTMLForExceptionOptions | options
     else:
         opt = HTMLForExceptionOptions
     return CGITraceback.html(context=context, options=opt)

webware/WebUtils/HTMLForException.py

@@ -29,8 +29,7 @@ def htmlForLines(lines, options=None):
 
     # Set up the options:
     if options:
-        opt = HTMLForExceptionOptions.copy()
-        opt.update(options)
+        opt = HTMLForExceptionOptions | options
     else:
         opt = HTMLForExceptionOptions