diff --git a/doc/xrpcserver.html b/doc/xrpcserver.html
index 9e66610..393e72d 100644
--- a/doc/xrpcserver.html
+++ b/doc/xrpcserver.html
@@ -125,7 +125,7 @@ Static Methods
SaveXMLRPCServer (Constructor)
-SaveXMLRPCServer(addr, logRequests=True, allow_none=False, use_builtin_types=False, ipacl=None)
+SaveXMLRPCServer(addr, logRequests=True, allow_none=False, ipacl=None)
Init SaveXMLRPCServer class.
diff --git a/eric-revpipyload.api b/eric-revpipyload.api
index 8921fbc..354bb8c 100644
--- a/eric-revpipyload.api
+++ b/eric-revpipyload.api
@@ -105,4 +105,4 @@ xrpcserver.SaveXMLRPCServer.isAlive?4()
xrpcserver.SaveXMLRPCServer.register_function?4(acl_level, function, name=None)
xrpcserver.SaveXMLRPCServer.start?4()
xrpcserver.SaveXMLRPCServer.stop?4()
-xrpcserver.SaveXMLRPCServer?1(addr, logRequests=True, allow_none=False, use_builtin_types=False, ipacl=None)
+xrpcserver.SaveXMLRPCServer?1(addr, logRequests=True, allow_none=False, ipacl=None)
diff --git a/revpipyload.e4p b/revpipyload.e4p
index 1141676..2fc0562 100644
--- a/revpipyload.e4p
+++ b/revpipyload.e4p
@@ -1,7 +1,7 @@
-
+
en_US
@@ -9,7 +9,7 @@
Python3
Console
Dieser Loader wird über das Init-System geladen und führt das angegebene Pythonprogramm aus. Es ist für den RevolutionPi gedacht um automatisch das SPS-Programm zu starten.
- 0.6.4
+ 0.6.5
Sven Sager
akira@narux.de
diff --git a/revpipyload/revpipyload.py b/revpipyload/revpipyload.py
index 1c9185a..fc101a8 100755
--- a/revpipyload/revpipyload.py
+++ b/revpipyload/revpipyload.py
@@ -50,7 +50,7 @@ from time import asctime
from xmlrpc.client import Binary
from xrpcserver import SaveXMLRPCServer
-pyloadversion = "0.6.4"
+pyloadversion = "0.6.5"
class RevPiPyLoad():
@@ -743,6 +743,9 @@ class RevPiPyLoad():
if filedata is None or filename is None:
return False
+ # Windowszeichen prüfen
+ filename = filename.replace("\\", "/")
+
# Absoluten Pfad prüfen
dirname = os.path.join(self.plcworkdir, os.path.dirname(filename))
if self.plcworkdir not in os.path.abspath(dirname):
diff --git a/revpipyload/xrpcserver.py b/revpipyload/xrpcserver.py
index 1f3d1df..ae1f807 100644
--- a/revpipyload/xrpcserver.py
+++ b/revpipyload/xrpcserver.py
@@ -17,8 +17,7 @@ class SaveXMLRPCServer(SimpleXMLRPCServer):
"""Erstellt einen erweiterten XMLRPCServer."""
def __init__(
- self, addr, logRequests=True, allow_none=False,
- use_builtin_types=False, ipacl=None):
+ self, addr, logRequests=True, allow_none=False, ipacl=None):
"""Init SaveXMLRPCServer class.
@param ipacl AclManager """
proginit.logger.debug("enter SaveXMLRPCServer.__init__()")
@@ -34,7 +33,6 @@ class SaveXMLRPCServer(SimpleXMLRPCServer):
allow_none=allow_none,
encoding="utf-8",
bind_and_activate=False,
- use_builtin_types=use_builtin_types
)
# Klassenvariablen
@@ -128,13 +126,13 @@ class SaveXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
# ACL für IP-Adresse übernehmen
self.server.requestacl = \
- self.server.aclmgr.get_acllevel(self.address_string())
+ self.server.aclmgr.get_acllevel(self.client_address[0])
if self.server.requestacl >= 0:
return True
else:
self.send_error(
- 401, "IP '{}' not allowed".format(self.address_string())
+ 401, "IP '{}' not allowed".format(self.client_address[0])
)
return False
diff --git a/setup.py b/setup.py
index 9e6a1b3..8307359 100644
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@ setup(
license="LGPLv3",
name="revpipyload",
- version="0.6.4",
+ version="0.6.5",
scripts=["data/revpipyload"],