Merge pull request #128 from TomasKorbar/changes

Fix problems with saving of advanced settings

Author: zdohnal

cupspk.py

@@ -448,7 +448,7 @@ def putFile(self, *args, **kwds):
             if fd is not None:
                 os.lseek (fd, 0, os.SEEK_SET)
                 buf = os.read (fd, 512)
-                while buf != '':
+                while buf != '' and buf != b'':
                     os.write (tmpfd, buf)
                     buf = os.read (fd, 512)
             else:

serversettings.py

@@ -440,6 +440,9 @@ def saveAdvanced (self):
                 has_browsepoll = True
                 break
 
+        # Return to the start of file
+        f.seek(0)
+
         for line in f:
             line = line.decode('UTF-8')
             l = line.lower ().strip ()