.

slapos/monitor/monitor.py

@@ -22,8 +22,6 @@ import socket
 from datetime import datetime
 from xml.sax.saxutils import escape
 
-from slapos.util import bytes2str
-
 OPML_START = """<?xml version="1.0" encoding="UTF-8"?>
 <!-- OPML generated by SlapOS -->
 <opml version="1.1">
@@ -233,7 +231,7 @@ class Monitoring(object):
       print("ERROR: Timeout with %r while downloading monitor config at %s " % (e, url))
     else:
       try:
-        monitor_dict = json.loads(bytes2str(response.read()))
+        monitor_dict = json.loads(response.read())
         monitor_title = monitor_dict.get('title', 'Unknown Instance')
         success = True
       except ValueError as e:

slapos/promise/plugin/monitor_partition_space.py

@@ -190,7 +190,7 @@ class RunPromise(GenericPromise):
     check_date = self.getConfig('test-check-date')
     path = os.path.join(self.getPartitionFolder(), "") + "extrafolder"
     partitions = psutil.disk_partitions()
-    while path is not '/':
+    while path != '/':
       if not disk_partition:
         path = os.path.dirname(path)
       else:

slapos/test/monitor/testglobalstate.py

@@ -92,7 +92,7 @@ ipv4 = 10.0.151.118
       pkg_resources.resource_string(
         'slapos.monitor',
         'doc/monitor_instance.schema.json')
-    self.monitor_instance_schema = json.loads(monitor_schema_string.decode('utf-8'))
+    self.monitor_instance_schema = json.loads(monitor_schema_string)
 
 
     self.monitor_config_dict = dict(