Merge pull request #3 from robotpy/master

Updating fork

Author: amorygalili

.travis.yml

@@ -1,25 +1,18 @@
 ---
 language: python
+python:
+- "3.6"
 services:
 - docker
 
 install:
-- pip install sphinx sphinx-rtd-theme
+- pip install sphinx sphinx-rtd-theme black
 
 script:
 - make -C docs html
+- black --check --diff .
 - ./build_exe.sh
 
-jobs:
-  include:
-  - stage: format-check
-    python:
-    - "3.6"
-    install:
-    - pip install black
-    script:
-    - black --check --diff .
-
 deploy:
 - provider: pypi
   user: $PYPI_USERNAME

build_exe.sh

@@ -4,7 +4,7 @@
 #
 
 cd $(dirname $0)
-docker run --rm -v "$(pwd):/src:Z" -e PYTHONPATH=/src cdrx/pyinstaller-windows:python2
-docker run --rm -v "$(pwd):/src:Z" --entrypoint /bin/bash cdrx/pyinstaller-windows:python2 -c "chown -R $(id -u $USERNAME) /src/dist"
+docker run --rm -v "$(pwd):/src:Z" -e PYTHONPATH=/src cdrx/pyinstaller-windows:python3
+docker run --rm -v "$(pwd):/src:Z" --entrypoint /bin/bash cdrx/pyinstaller-windows:python3 -c "chown -R $(id -u $USERNAME) /src/dist"
 
 zip dist/pynetworktables2js-$(git describe --tags).zip dist/windows/pynetworktables2js.exe

pynetworktables2js/js/networktables.js

@@ -112,13 +112,21 @@ var NetworkTables = new function () {
 	              that indicates whether the websocket is connected
 	    :param immediateNotify: If true, the function will be immediately called
 	                            with the current status of the websocket
+	 	:returns: a function that will unsubscribe
     */
 	this.addWsConnectionListener = function(f, immediateNotify) {
 		connectionListeners.push(f);
 
 		if (immediateNotify == true) {
 			f(socketOpen);
 		}
+
+		return function() {
+			const index = connectionListeners.indexOf(f);
+			if (index !== -1) {
+				connectionListeners.splice(index, 1);
+			}
+		}
 	};
 
 	/**
@@ -130,13 +138,21 @@ var NetworkTables = new function () {
 	              that indicates whether the robot is connected
 	    :param immediateNotify: If true, the function will be immediately called
 	                            with the current robot connection state
+	 	:returns: a function that will unsubscribe
 	*/
 	this.addRobotConnectionListener = function(f, immediateNotify) {
 		robotConnectionListeners.push(f);
 
 		if (immediateNotify == true) {
 			f(robotConnected);
 		}
+
+		return function() {
+			const index = robotConnectionListeners.indexOf(f);
+			if (index !== -1) {
+				robotConnectionListeners.splice(index, 1);
+			}
+		}
 	}
 
 	/**
@@ -146,6 +162,7 @@ var NetworkTables = new function () {
 	              for entry, value: value of entry, isNew: If true, the entry has just been created
 	    :param immediateNotify: If true, the function will be immediately called
 	                            with the current value of all keys
+	 	:returns: a function that will unsubscribe
     */
 	this.addGlobalListener = function(f, immediateNotify) {
 		globalListeners.push(f);
@@ -155,6 +172,13 @@ var NetworkTables = new function () {
 				f(k, v, true);
 			});
 		}
+
+		return function() {
+			const index = globalListeners.indexOf(f);
+			if (index !== -1) {
+				globalListeners.splice(index, 1);
+			}
+		}
 	};
 
 	/**
@@ -165,6 +189,7 @@ var NetworkTables = new function () {
 	              for entry, value: value of entry, isNew: If true, the entry has just been created
 	    :param immediateNotify: If true, the function will be immediately called
 	                            with the current value of the specified key
+	 	:returns: a function that will unsubscribe
 	*/
 	this.addKeyListener = function(key, f, immediateNotify) {
 		var listeners = keyListeners.get(key);
@@ -180,6 +205,13 @@ var NetworkTables = new function () {
 				f(key, v, true);
 			}
 		}
+
+		return function() {
+			const index = keyListeners.get(key).indexOf(f);
+			if (index !== -1) {
+				keyListeners.get(key).splice(index, 1);
+			}
+		}
 	};
 
 	/**

requirements.txt

@@ -1,2 +1,2 @@
 tornado>=4.0
-pynetworktables>=2018.2.0
+pynetworktables>=2019.0.0