diff roundup/scripts/roundup_server.py @ 6325:1a15089c2e49 issue2550923_computed_property

Merge trunk into branch
author John Rouillard <rouilj@ieee.org>
date Sat, 06 Feb 2021 20:15:26 -0500
parents ff6580ee3882
children 5d6b6e948e17
line wrap: on
line diff
--- a/roundup/scripts/roundup_server.py	Fri Jan 15 16:34:30 2021 -0500
+++ b/roundup/scripts/roundup_server.py	Sat Feb 06 20:15:26 2021 -0500
@@ -50,7 +50,7 @@
     reload
 except NameError:
     # Python 3.
-    from imp import reload
+    from importlib import reload
 
 try:
     from OpenSSL import SSL
@@ -74,7 +74,7 @@
 # "default" favicon.ico
 # generate by using "icotool" and tools/base64
 import zlib, base64
-favico = zlib.decompress(base64.decodestring(b'''
+favico = zlib.decompress(base64.b64decode(b'''
 eJztjr1PmlEUh59XgVoshdYPWorFIhaRFq0t9pNq37b60lYSTRzcTFw6GAfj5gDYaF0dTB0MxMSE
 gQQd3FzKJiEC0UCIUUN1M41pV2JCXySg/0ITn5tfzvmdc+85FwT56HSc81UJjXJsk1UsNcsSqCk1
 BS64lK+vr7OyssLJyQl2ux2j0cjU1BQajYZIJEIwGMRms+H3+zEYDExOTjI2Nsbm5iZWqxWv18vW

Roundup Issue Tracker: http://roundup-tracker.org/