Rev3831, Fix Stats page compatibility with latest gevent

This commit is contained in:
shortcutme 2019-01-31 00:39:45 +01:00
parent 8447c6d79f
commit c2b879ccab
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
3 changed files with 6 additions and 5 deletions

View file

@ -23,7 +23,7 @@ class UiRequestPlugin(object):
else:
formatted = format % val
back.append("<td>%s</td>" % formatted)
return "<tr class='%s'>%s</tr>" % (class_name, "".join(back))
return "<tr class='%s'>%s</tr>" % (class_name.encode("utf8"), "".join(back).encode("utf8"))
def getObjSize(self, obj, hpy=None):
if hpy:
@ -39,6 +39,7 @@ class UiRequestPlugin(object):
from Db import Db
from Crypt import CryptConnection
hpy = None
if self.get.get("size") == "1": # Calc obj size
try:
@ -162,9 +163,9 @@ class UiRequestPlugin(object):
yield "</table>"
# Tor hidden services
yield "<br><br><b>Tor hidden services (status: %s):</b><br>" % main.file_server.tor_manager.status
yield b"<br><br><b>Tor hidden services (status: %s):</b><br>" % main.file_server.tor_manager.status.encode("utf8")
for site_address, onion in main.file_server.tor_manager.site_onions.items():
yield "- %-34s: %s<br>" % (site_address, onion)
yield "- %-34s: %s<br>" % (site_address, onion.encode("utf8"))
# Db
yield "<br><br><b>Db</b>:<br>"

View file

@ -13,7 +13,7 @@ class Config(object):
def __init__(self, argv):
self.version = "0.6.4"
self.rev = 3829
self.rev = 3831
self.argv = argv
self.action = None
self.pending_changes = {}

View file

@ -31,7 +31,7 @@ import SiteManager
class Site(object):
def __init__(self, address, allow_create=True, settings=None):
self.address = re.sub("[^A-Za-z0-9]", "", address) # Make sure its correct address
self.address = str(re.sub("[^A-Za-z0-9]", "", address)) # Make sure its correct address
self.address_hash = hashlib.sha256(self.address).digest()
self.address_short = "%s..%s" % (self.address[:6], self.address[-4:]) # Short address for logging
self.log = logging.getLogger("Site:%s" % self.address_short)