dsf-python 3.5.1rc1__tar.gz → 3.6.0b2.post2__tar.gz

{dsf_python-3.5.1rc1/src/dsf_python.egg-info → dsf_python-3.6.0b2.post2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dsf-python
-Version: 3.5.1rc1
+Version: 3.6.0b2.post2
 Summary: Python interface to access DuetSoftwareFramework
 Home-page: https://github.com/Duet3D/dsf-python
 Author: Duet3D Ltd.
@@ -36,7 +36,7 @@ This is also availabe as a [pip package on pypi](https://pypi.org/project/dsf-py
 
 Find out more about [Duet Software Framework](https://github.com/Duet3D/DuetSoftwareFramework).
 
-Find out more about [Duet Software Framework Python Bindings](https://github.com/Duet3D/dsf-python).
+Examples of the [Duet Software Framework Python Bindings](https://github.com/Duet3D/dsf-python/tree/main/examples).
 
 Get in touch with the community at [Duet Software Framework Forum](https://forum.duet3d.com/category/31/dsf-development) for bug reports, discussion and any kind of exchange.
 

{dsf_python-3.5.1rc1 → dsf_python-3.6.0b2.post2}/README.md

@@ -4,7 +4,7 @@ This is also availabe as a [pip package on pypi](https://pypi.org/project/dsf-py
 
 Find out more about [Duet Software Framework](https://github.com/Duet3D/DuetSoftwareFramework).
 
-Find out more about [Duet Software Framework Python Bindings](https://github.com/Duet3D/dsf-python).
+Examples of the [Duet Software Framework Python Bindings](https://github.com/Duet3D/dsf-python/tree/main/examples).
 
 Get in touch with the community at [Duet Software Framework Forum](https://forum.duet3d.com/category/31/dsf-development) for bug reports, discussion and any kind of exchange.
 

{dsf_python-3.5.1rc1 → dsf_python-3.6.0b2.post2}/setup.py

@@ -6,7 +6,7 @@ long_description = open("README.md", encoding="utf-8").read()
 
 setuptools.setup(
     name="dsf-python",
-    version="3.5.1rc1",
+    version="3.6.0-b2.post2",
     description="Python interface to access DuetSoftwareFramework",
     long_description=long_description,
     long_description_content_type="text/markdown",

{dsf_python-3.5.1rc1 → dsf_python-3.6.0b2.post2}/src/dsf/__init__.py

@@ -1,3 +1,5 @@
+__version__ = "3.6.0-b2.post2"
+
 # path to unix socket file
 SOCKET_FILE = "/run/dsf/dcs.sock"
 

{dsf_python-3.5.1rc1 → dsf_python-3.6.0b2.post2}/src/dsf/commands/code.py

@@ -134,7 +134,7 @@ class Code(BaseCommand):
         if self.type == CodeType.Comment:
             return "(comment)"
 
-        prefix = "G53 " if self.flags & CodeFlags.EnforceAbsolutePosition != 0 else ""
+        prefix = "G53 " if self.is_flag_set(CodeFlags.EnforceAbsolutePosition) else ""
         if self.majorNumber is not None:
             if self.minorNumber is not None:
                 return f"{prefix}{self.type}{self.majorNumber}.{self.minorNumber}"
@@ -158,3 +158,6 @@ class Code(BaseCommand):
             KeywordType.Echo: "echo",
             KeywordType.Global: "global",
         }.get(self.keyword)
+
+    def is_flag_set(self, flag: CodeFlags):
+        return self.flags & flag != 0

{dsf_python-3.5.1rc1 → dsf_python-3.6.0b2.post2}/src/dsf/commands/code_interception.py

@@ -28,4 +28,4 @@ def resolve_code(rtype: MessageType, content: Optional[str]):
         raise TypeError("rtype must be a MessageType")
     if content is not None and not isinstance(content, str):
         raise TypeError("content must be None or a string")
-    return BaseCommand("Resolve", **{"Type": rtype, "Content": content})
+    return BaseCommand("Resolve", **{"type": rtype, "content": content})

{dsf_python-3.5.1rc1 → dsf_python-3.6.0b2.post2}/src/dsf/commands/files.py

@@ -9,15 +9,16 @@ def get_file_info(file_name: str, read_thumbnail_content: bool = False):
     """
     if not isinstance(file_name, str) or not file_name:
         raise TypeError("file_name must be a string")
-    return BaseCommand("GetFileInfo", **{"FileName": file_name, "ReadThumbnailContent": read_thumbnail_content})
+    return BaseCommand("GetFileInfo", **{"fileName": file_name, "readThumbnailContent": read_thumbnail_content})
 
 
-def resolve_path(path: str):
+def resolve_path(path: str, base_directory: str = None):
     """
     Resolve a RepRapFirmware-style path to an actual file path
     :param path: Path that is RepRapFirmware-compatible
+    :param base_directory: Optional base directory to resolve the path relative to
     :returns: The resolved path
     """
     if not isinstance(path, str) or not path:
         raise TypeError("path must be a string")
-    return BaseCommand("ResolvePath", **{"Path": path})
+    return BaseCommand("ResolvePath", **{"path": path, "baseDirectory": base_directory})

{dsf_python-3.5.1rc1 → dsf_python-3.6.0b2.post2}/src/dsf/commands/generic.py

@@ -17,7 +17,7 @@ def check_password(password: str):
     """
     if not isinstance(password, str) or not password:
         raise TypeError("password must be a string")
-    return BaseCommand("CheckPassword", **{"Password": password})
+    return BaseCommand("CheckPassword", **{"password": password})
 
 
 def evaluate_expression(channel: CodeChannel, expression: str):
@@ -33,7 +33,7 @@ def evaluate_expression(channel: CodeChannel, expression: str):
         raise TypeError("channel must be a CodeChannel")
     if not isinstance(expression, str) or not expression:
         raise TypeError("expression must be a string")
-    return BaseCommand("EvaluateExpression", **{"Channel": channel, "Expression": expression})
+    return BaseCommand("EvaluateExpression", **{"channel": channel, "expression": expression})
 
 
 def flush(channel: CodeChannel, sync_file_streams: bool = False, if_executing: bool = True):
@@ -57,7 +57,7 @@ def flush(channel: CodeChannel, sync_file_streams: bool = False, if_executing: b
     if not isinstance(if_executing, bool):
         raise TypeError("if_executing must be a boolean")
     return BaseCommand("Flush",
-                       **{"Channel": channel, "SyncFileStreams": sync_file_streams, "IfExecuting": if_executing})
+                       **{"channel": channel, "syncFileStreams": sync_file_streams, "ifExecuting": if_executing})
 
 
 def invalidate_channel(channel: CodeChannel):
@@ -70,7 +70,7 @@ def invalidate_channel(channel: CodeChannel):
     """
     if not isinstance(channel, CodeChannel):
         raise TypeError("channel must be a CodeChannel")
-    return BaseCommand("InvalidateChannel", **{"Channel": channel})
+    return BaseCommand("InvalidateChannel", **{"channel": channel})
 
 
 def set_update_status(updating: bool):
@@ -81,7 +81,7 @@ def set_update_status(updating: bool):
     """
     if not isinstance(updating, bool):
         raise TypeError("updating must be a boolean")
-    return BaseCommand("SetUpdateStatus", **{"Updating": updating})
+    return BaseCommand("SetUpdateStatus", **{"updating": updating})
 
 
 def simple_code(code: str, channel: CodeChannel = CodeChannel.DEFAULT_CHANNEL, async_exec: bool = False):
@@ -101,7 +101,7 @@ def simple_code(code: str, channel: CodeChannel = CodeChannel.DEFAULT_CHANNEL, a
         raise TypeError("code must be a string")
     if not isinstance(channel, CodeChannel):
         raise TypeError("channel must be a CodeChannel")
-    return BaseCommand("SimpleCode", **{"Code": code, "Channel": channel, "ExecuteAsynchronously": async_exec})
+    return BaseCommand("SimpleCode", **{"code": code, "channel": channel, "executeAsynchronously": async_exec})
 
 
 def write_message(
@@ -129,9 +129,9 @@ def write_message(
     return BaseCommand(
         "WriteMessage",
         **{
-            "Type": message_type,
-            "Content": content,
-            "OutputMessage": output_message,
-            "LogLevel": log_level,
+            "type": message_type,
+            "content": content,
+            "outputMessage": output_message,
+            "logLevel": log_level,
         },
     )

{dsf_python-3.5.1rc1 → dsf_python-3.6.0b2.post2}/src/dsf/commands/http_endpoints.py

@@ -25,10 +25,10 @@ def add_http_endpoint(endpoint_type: HttpEndpointType, namespace: str, path: str
     return BaseCommand(
         "AddHttpEndpoint",
         **{
-            "EndpointType": endpoint_type,
-            "Namespace": namespace,
-            "Path": path,
-            "IsUploadRequest": is_upload_request,
+            "endpointType": endpoint_type,
+            "namespace": namespace,
+            "path": path,
+            "isUploadRequest": is_upload_request,
         },
     )
 
@@ -49,5 +49,5 @@ def remove_http_endpoint(endpoint_type: HttpEndpointType, namespace: str, path:
         raise TypeError("path must be a string")
     return BaseCommand(
         "RemoveHttpEndpoint",
-        **{"EndpointType": endpoint_type, "Namespace": namespace, "Path": path},
+        **{"endpointType": endpoint_type, "namespace": namespace, "path": path},
     )

{dsf_python-3.5.1rc1 → dsf_python-3.6.0b2.post2}/src/dsf/commands/object_model.py

@@ -24,7 +24,7 @@ def patch_object_model(key: str, patch: str):
         raise TypeError("key must be a string")
     if not isinstance(patch, str) or not patch:
         raise TypeError("patch must be a string")
-    return BaseCommand("PatchObjectModel", **{"Key": key, "Patch": patch})
+    return BaseCommand("PatchObjectModel", **{"key": key, "patch": patch})
 
 
 def set_network_protocol(protocol: str, enabled: bool):
@@ -38,7 +38,7 @@ def set_network_protocol(protocol: str, enabled: bool):
         raise TypeError("protocol must be a string")
     if not isinstance(enabled, bool):
         raise TypeError("enabled must be a boolean")
-    return BaseCommand("SetNetworkProtocol", **{"NetworkProtocol": protocol, "Enabled": enabled})
+    return BaseCommand("SetNetworkProtocol", **{"networkProtocol": protocol, "enabled": enabled})
 
 
 def set_object_model(property_path: str, value: str):
@@ -53,7 +53,7 @@ def set_object_model(property_path: str, value: str):
         raise TypeError("property_path must be a string")
     if not isinstance(value, str):
         raise TypeError("value must be a string")
-    return BaseCommand("SetObjectModel", **{"PropertyPath": property_path, "Value": value})
+    return BaseCommand("SetObjectModel", **{"propertyPath": property_path, "value": value})
 
 
 def sync_object_model():

{dsf_python-3.5.1rc1 → dsf_python-3.6.0b2.post2}/src/dsf/commands/packages.py

@@ -7,7 +7,7 @@ def install_system_package(package_file: str):
     """
     if not isinstance(package_file, str) or not package_file:
         raise TypeError("package_file must be a string")
-    return BaseCommand("InstallSystemPackage", **{"PackageFile": package_file})
+    return BaseCommand("InstallSystemPackage", **{"packageFile": package_file})
 
 
 def uninstall_system_package(package: str):
@@ -16,4 +16,4 @@ def uninstall_system_package(package: str):
     """
     if not isinstance(package, str) or not package:
         raise TypeError("package must be a string")
-    return BaseCommand("UninstallSystemPackage", **{"Package": package})
+    return BaseCommand("UninstallSystemPackage", **{"package": package})

{dsf_python-3.5.1rc1 → dsf_python-3.6.0b2.post2}/src/dsf/commands/plugins.py

@@ -8,7 +8,7 @@ def install_plugin(plugin_file: str):
     """
     if not isinstance(plugin_file, str) or not plugin_file:
         raise TypeError("plugin_file must be a string")
-    return BaseCommand("InstallPlugin", **{"PluginFile": plugin_file})
+    return BaseCommand("InstallPlugin", **{"pluginFile": plugin_file})
 
 
 def reload_plugin(plugin: str):
@@ -18,7 +18,7 @@ def reload_plugin(plugin: str):
     """
     if not isinstance(plugin, str) or not plugin:
         raise TypeError("plugin must be a string")
-    return BaseCommand("ReloadPlugin", **{"Plugin": plugin})
+    return BaseCommand("ReloadPlugin", **{"plugin": plugin})
 
 
 def set_plugin_data(plugin: str, key: str, value: str):
@@ -37,7 +37,7 @@ def set_plugin_data(plugin: str, key: str, value: str):
     if not isinstance(value, str):
         raise TypeError("value must be a string")
     return BaseCommand(
-        "SetPluginData", **{"Plugin": plugin, "Key": key, "Value": value}
+        "SetPluginData", **{"Plugin": plugin, "key": key, "value": value}
     )
 
 
@@ -49,7 +49,7 @@ def start_plugin(plugin: str, save_state: bool = True):
     """
     if not isinstance(plugin, str) or not plugin:
         raise TypeError("plugin must be a string")
-    return BaseCommand("StartPlugin", **{"Plugin": plugin, "SaveState": save_state})
+    return BaseCommand("StartPlugin", **{"plugin": plugin, "saveState": save_state})
 
 
 def start_plugins():
@@ -65,7 +65,7 @@ def stop_plugin(plugin: str, save_state: bool = True):
     """
     if not isinstance(plugin, str) or not plugin:
         raise TypeError("plugin must be a string")
-    return BaseCommand("StopPlugin", **{"Plugin": plugin, "SaveState": save_state})
+    return BaseCommand("StopPlugin", **{"plugin": plugin, "saveState": save_state})
 
 
 def stop_plugins():
@@ -81,4 +81,4 @@ def uninstall_plugin(plugin: str):
     """
     if not isinstance(plugin, str) or not plugin:
         raise TypeError("plugin must be a string")
-    return BaseCommand("UninstallPlugin", **{"Plugin": plugin})
+    return BaseCommand("UninstallPlugin", **{"plugin": plugin})

{dsf_python-3.5.1rc1 → dsf_python-3.6.0b2.post2}/src/dsf/commands/user_sessions.py

@@ -19,9 +19,9 @@ def add_user_session(access_level: AccessLevel, session_type: SessionType, origi
     return BaseCommand(
         "AddUserSession",
         **{
-            "AccessLevel": access_level,
-            "SessionType": session_type,
-            "Origin": origin,
+            "accessLevel": access_level,
+            "sessionType": session_type,
+            "origin": origin,
         },
     )
 
@@ -33,4 +33,4 @@ def remove_user_session(session_id: int):
     """
     if not isinstance(session_id, int):
         raise TypeError("session_id must be an integer")
-    return BaseCommand("RemoveUserSession", **{"Id": session_id})
+    return BaseCommand("RemoveUserSession", **{"id": session_id})

{dsf_python-3.5.1rc1 → dsf_python-3.6.0b2.post2}/src/dsf/connections/init_messages/client_init_messages.py

@@ -70,12 +70,12 @@ def intercept_init_message(
     return ClientInitMessage(
         ConnectionMode.INTERCEPT,
         **{
-            "InterceptionMode": intercept_mode,
-            "Channels": channels,
-            "AutoFlush": auto_flush,
-            "AutoEvaluateExpressions": auto_evaluate_expression,
-            "Filters": filters,
-            "PriorityCodes": priority_codes,
+            "interceptionMode": intercept_mode,
+            "channels": channels,
+            "autoFlush": auto_flush,
+            "autoEvaluateExpressions": auto_evaluate_expression,
+            "filters": filters,
+            "priorityCodes": priority_codes,
         },
     )
 
@@ -90,8 +90,8 @@ def subscribe_init_message(subscription_mode: SubscriptionMode, filter_string: s
     return ClientInitMessage(
         ConnectionMode.SUBSCRIBE,
         **{
-            "SubscriptionMode": subscription_mode,
-            "Filter": filter_string,
-            "Filters": filter_list,
+            "subscriptionMode": subscription_mode,
+            "filter": filter_string,
+            "filters": filter_list,
         },
     )

{dsf_python-3.5.1rc1 → dsf_python-3.6.0b2.post2}/src/dsf/http.py

@@ -1,5 +1,8 @@
 import asyncio
 import json
+import socket
+import stat
+import errno
 import os
 from concurrent.futures import ThreadPoolExecutor
 from enum import Enum
@@ -11,10 +14,11 @@ from .object_model import HttpEndpointType
 class HttpResponseType(str, Enum):
     """Enumeration of supported HTTP responses"""
 
-    StatusCode = "StatusCode"
-    PlainText = "PlainText"
-    JSON = "JSON"
-    File = "File"
+    StatusCode = "statuscode"
+    PlainText = "plainText"
+    JSON = "json"
+    File = "file"
+    URI = "uri"
 
 
 class ReceivedHttpRequest:
@@ -47,7 +51,7 @@ class HttpEndpointConnection:
         """Close the connection"""
         self.writer.close()
 
-    async def read_request(self):
+    async def read_request(self) -> ReceivedHttpRequest:
         """
         Read information about the last HTTP request.
         Note that a call to this method may fail!
@@ -67,9 +71,9 @@ class HttpEndpointConnection:
         try:
             await self.send(
                 {
-                    "StatusCode": status_code,
-                    "Response": response,
-                    "ResponseType": response_type,
+                    "statusCode": status_code,
+                    "response": response,
+                    "responseType": response_type,
                 }
             )
         finally:
@@ -149,11 +153,47 @@ class HttpEndpointUnixSocket:
         """Set the handler to handle client connections"""
         self.handler = handler
 
+    def _create_socket(self, path: str):
+        path = os.fspath(path)
+        sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+
+        # Check for abstract socket. `str` and `bytes` paths are supported.
+        if path[0] not in (0, '\x00'):
+            try:
+                if stat.S_ISSOCK(os.stat(path).st_mode):
+                    os.remove(path)
+            except FileNotFoundError:
+                pass
+            except OSError as err:
+                # Directory may have permissions only to create socket.
+                # logger.error('Unable to check or remove stale UNIX socket '
+                #                 '%r: %r', path, err)
+                pass
+
+        try:
+            sock.bind(path)
+            os.chmod(path, os.stat(path).st_mode | stat.S_IWGRP | stat.S_IRGRP)
+        except OSError as exc:
+            sock.close()
+            if exc.errno == errno.EADDRINUSE:
+                # Let's improve the error message by adding
+                # with what exact address it occurs.
+                msg = f'Address {path!r} is already in use'
+                raise OSError(errno.EADDRINUSE, msg) from None
+            else:
+                raise
+        except:
+            sock.close()
+            raise
+
+        return sock
+
     def start_connection_listener(self):
         try:
             self._loop = asyncio.new_event_loop()
+            sock = self._create_socket(self.socket_file)
             self._server = asyncio.start_unix_server(
-                self.handle_connection, self.socket_file, backlog=self.backlog
+                self.handle_connection, sock=sock, backlog=self.backlog
             )
             self._loop.create_task(self._server)
             self._loop.run_forever()

{dsf_python-3.5.1rc1 → dsf_python-3.6.0b2.post2}/src/dsf/object_model/move/input_shaping.py

@@ -23,10 +23,10 @@ class InputShapingType(str, Enum):
     zvddd = "zvddd"
 
     # EI2 (2-hump)
-    ei2 = "ei2"
+    ei2 = "eI2"
 
     # EI3 (3-hump)
-    ei3 = "ei3"
+    ei3 = "eI3"
 
     # Custom
     custom = "custom"

{dsf_python-3.5.1rc1 → dsf_python-3.6.0b2.post2}/src/dsf/object_model/sensors/probe_type.py

@@ -36,3 +36,6 @@ class ProbeType(IntEnum):
 
     # Z motor stall detection
     ZMotorStall = 10
+
+    # Scanning Z Probe
+    ScanningZProbe = 11

{dsf_python-3.5.1rc1 → dsf_python-3.6.0b2.post2}/src/dsf/object_model/spindles/spindles.py

@@ -1,6 +1,8 @@
 from .spindle_state import SpindleState
 from ..model_object import ModelObject
 
+from typing import Union
+
 
 class Spindle(ModelObject):
     """Information about a CNC spindles"""
@@ -29,85 +31,85 @@ class Spindle(ModelObject):
         self._state = SpindleState.unconfigured
         
     @property
-    def active(self) -> int:
+    def active(self) -> Union[int, None]:
         """Active RPM"""
         return self._active
     
     @active.setter
-    def active(self, value: int):
-        self._active = int(value)
+    def active(self, value: Union[int, None]):
+        self._active = None if value is None else int(value)
         
     @property
-    def can_reverse(self) -> bool:
+    def can_reverse(self) -> Union[bool, None]:
         """Flags whether the spindles may spin in reverse direction"""
         return self._can_reverse
     
     @can_reverse.setter
-    def can_reverse(self, value: bool):
-        self._can_reverse = bool(value)
+    def can_reverse(self, value: Union[bool, None]):
+        self._can_reverse = None if value is None else bool(value)
         
     @property
-    def current(self) -> int:
+    def current(self) -> Union[int, None]:
         """Current RPM, negative if anticlockwise direction"""
         return self._current
     
     @current.setter
-    def current(self, value: int):
-        self._current = int(value)
+    def current(self, value: Union[int, None]):
+        self._current = None if value is None else int(value)
         
     @property
-    def frequency(self) -> int:
+    def frequency(self) -> Union[int, None]:
         """Frequency (in Hz)"""
         return self._frequency
     
     @frequency.setter
-    def frequency(self, value: int):
-        self._frequency = int(value)
+    def frequency(self, value: Union[int, None]):
+        self._frequency = None if value is None else int(value)
 
     @property
-    def idle_pwm(self) -> float:
+    def idle_pwm(self) -> Union[float, None]:
         """Idle PWM value (0..1)"""
         return self._idle_pwm
 
     @idle_pwm.setter
-    def idle_pwm(self, value: float):
-        self._idle_pwm = float(value)
+    def idle_pwm(self, value: Union[float, None]):
+        self._idle_pwm = None if value is None else float(value)
         
     @property
-    def max(self) -> int:
+    def max(self) -> Union[int, None]:
         """Maximum RPM"""
         return self._max
     
     @max.setter
-    def max(self, value: int):
-        self._max = int(value)
+    def max(self, value: Union[int, None]):
+        self._max = None if value is None else int(value)
 
     @property
-    def max_pwm(self) -> float:
+    def max_pwm(self) -> Union[float, None]:
         """Maximum PWM value when turned on (0..1)"""
         return self._max_pwm
 
     @max_pwm.setter
-    def max_pwm(self, value: float):
-        self._max_pwm = float(value)
+    def max_pwm(self, value: Union[float, None]):
+        self._max_pwm = None if value is None else float(value)
         
     @property
-    def min(self) -> int:
+    def min(self) -> Union[int, None]:
         """Minimum RPM when turned on"""
         return self._min
     
     @min.setter
-    def min(self, value: int):
-        self._min = int(value)
+    def min(self, value: Union[int, None]):
+        self._min = None if value is None else int(value)
 
     @property
-    def min_pwm(self) -> float:
+    def min_pwm(self) -> Union[float, None]:
         """Minimum PWM value when turned on (0..1)"""
         return self._min_pwm
 
     @min_pwm.setter
-    def min_pwm(self, value: float):
-        self._min_pwm = float(value)
+    def min_pwm(self, value: Union[float, None]):
+        self._min_pwm = None if value is None else float(value)
         
     @property
     def state(self) -> SpindleState:

{dsf_python-3.5.1rc1 → dsf_python-3.6.0b2.post2/src/dsf_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dsf-python
-Version: 3.5.1rc1
+Version: 3.6.0b2.post2
 Summary: Python interface to access DuetSoftwareFramework
 Home-page: https://github.com/Duet3D/dsf-python
 Author: Duet3D Ltd.
@@ -36,7 +36,7 @@ This is also availabe as a [pip package on pypi](https://pypi.org/project/dsf-py
 
 Find out more about [Duet Software Framework](https://github.com/Duet3D/DuetSoftwareFramework).
 
-Find out more about [Duet Software Framework Python Bindings](https://github.com/Duet3D/dsf-python).
+Examples of the [Duet Software Framework Python Bindings](https://github.com/Duet3D/dsf-python/tree/main/examples).
 
 Get in touch with the community at [Duet Software Framework Forum](https://forum.duet3d.com/category/31/dsf-development) for bug reports, discussion and any kind of exchange.
 

{dsf_python-3.5.1rc1 → dsf_python-3.6.0b2.post2}/tests/test_custom_m_codes.py

@@ -27,18 +27,18 @@ def test_custom_m_codes(monkeypatch, tmp_path):
         server.listen(1)
         conn, _ = server.accept()
         print("send all")
-        conn.sendall(b'{"version":11, "id":"foobar"}')
+        conn.sendall(b'{"version":12, "id":"foobar"}')
         assert (
             conn.recv(1024) == b"{"
-            b'"mode":"Intercept","version":11,"InterceptionMode":"Pre","Channels":["HTTP","Telnet",'
-            b'"File","USB","Aux","Trigger","Queue","LCD","SBC","Daemon","Aux2","AutoPause","Unknown"],'
-            b'"Filters":null,"PriorityCodes":false'
+            b'"mode":"Intercept","version":12,"interceptionMode":"Pre","channels":["HTTP","Telnet",'
+            b'"File","USB","Aux","Trigger","Queue","LCD","SBC","Daemon","Aux2","Autopause","Unknown"],'
+            b'"filters":null,"priorityCodes":false'
             b"}"
         )
         conn.sendall(b'{"success":true}')
         conn.sendall(
             b"{"
-            b'"connection":{"id":12,"apiVersion":10,"isConnected":true},"sourceConnection":12,'
+            b'"connection":{"id":12,"apiVersion":12,"isConnected":true},"sourceConnection":12,'
             b'"result":null,"type":"M","channel":"HTTP","lineNumber":null,"indent":0,"keyword":0,'
             b'"keywordArgument":null,"majorNumber":1234,"minorNumber":null,"flags":2048,"comment":null,'
             b'"filePosition":null,"length":6,"parameters":[],"command":"Code"'
@@ -49,7 +49,7 @@ def test_custom_m_codes(monkeypatch, tmp_path):
         assert conn.recv(1024) == b'{"command":"Resolve","Type":0,"Content":null}'
         conn.sendall(
             b"{"
-            b'"connection":{"id":12,"apiVersion":10,"isConnected":true},"sourceConnection":12,'
+            b'"connection":{"id":12,"apiVersion":12,"isConnected":true},"sourceConnection":12,'
             b'"result":null,"type":"M","channel":"HTTP","lineNumber":null,"indent":0,"keyword":0,'
             b'"keywordArgument":null,"majorNumber":5678,"minorNumber":null,"flags":2048,"comment":null,'
             b'"filePosition":null,"length":6,"parameters":[],"command":"Code"'

{dsf_python-3.5.1rc1 → dsf_python-3.6.0b2.post2}/tests/test_object_model.py

@@ -50,7 +50,7 @@ class Model(unittest.TestCase):
     def test_json_serialization(self):
         # Hint: To get the object model, execute the command get_object_model() from any connection in debug mode
         # and take the JSON returned from debug (after "recv:")
-        with open('object_model/model_geminiv2.json') as fp:
+        with open('tests/object_model/model_geminiv2.json') as fp:
             json_data = json.load(fp)
         model = ObjectModel.from_json(json_data)
         json_text = json.dumps(json_data, sort_keys=True)

{dsf_python-3.5.1rc1 → dsf_python-3.6.0b2.post2}/tests/test_subscribe_object_model.py

@@ -26,7 +26,7 @@ def test_subscribe_object_model(monkeypatch, tmp_path):
         server.bind(mock_dcs_socket_file)
         server.listen(1)
         conn, _ = server.accept()
-        conn.sendall('{"version":11, "id":"foobar"}'.encode())
+        conn.sendall('{"version":12, "id":"foobar"}'.encode())
         assert (
             conn.recv(1024)
             == b'{"mode":"Subscribe","version":11,"SubscriptionMode":"Patch","Filter":"","Filters":null}'