[#367] Fixed the import statement for taskscheduler in `DisplayCAL.…

…profile_loader.setup_profile_loader_task()`.

DisplayCAL/network.py

@@ -153,4 +153,4 @@ def get_single_response(self):
 
     def send_command(self, command):
         # Automatically append newline (command end marker)
-        self.sendall(safe_str(command, "UTF-8") + "\n")
+        self.sendall(safe_str(command, "utf-8") + "\n")

DisplayCAL/profile_loader.py

@@ -117,7 +117,7 @@
 
     def setup_profile_loader_task(exe, exedir, pydir):
         if sys.getwindowsversion() >= (6,):
-            import taskscheduler
+            from DisplayCAL import taskscheduler
 
             taskname = appname + " Profile Loader Launcher"
 
@@ -3037,7 +3037,7 @@ def _check_display_conf(self):
             timestamp = time.time()
             localtime = list(time.localtime(self._timestamp))
             localtime[3:6] = 23, 59, 59
-            midnight = time.mktime(localtime) + 1
+            midnight = time.mktime(tuple(localtime)) + 1
             if timestamp >= midnight:
                 self.reload_count = 0
                 self._timestamp = timestamp

DisplayCAL/util_str.py

@@ -512,7 +512,7 @@ def replace_control_chars(txt, replacement=" ", collapse=False):
 
 
 def safe_basestring(obj, enc="utf-8", errors="replace"):
-    """Return a unicode or string representation of obj
+    """Return a string or bytes representation of obj.
 
     Return obj if isinstance(obj, basestring). Otherwise, return unicode(obj),
     string(obj), or repr(obj), whichever succeeds first.