Upgrade to latest version of pynetworktables

Author: virtuald

pynetworktables2js/__main__.py

@@ -18,9 +18,14 @@
 import tornado.web
 from tornado.ioloop import IOLoop
 
-from networktables import NetworkTable
+from networktables import NetworkTables
 from . import get_handlers, NonCachingStaticFileHandler
 
+try:
+    from .version import __version__
+except ImportError:
+    __version__ = '__master__'
+
 import logging
 logger = logging.getLogger('dashboard')
 
@@ -31,13 +36,14 @@ def init_networktables(options):
 
     if options.dashboard:
         logger.info("Connecting to networktables in Dashboard mode")
-        NetworkTable.setDashboardMode()
+        NetworkTables.setDashboardMode()
     else:
         logger.info("Connecting to networktables at %s", options.robot)
-        NetworkTable.setIPAddress(options.robot)
-        NetworkTable.setClientMode()
+        NetworkTables.setIPAddress(options.robot)
+        NetworkTables.setClientMode()
 
-    NetworkTable.initialize()
+    NetworkTables.setNetworkIdentity(options.identity)
+    NetworkTables.initialize()
     logger.info("Networktables Initialized")
 
 
@@ -58,6 +64,9 @@ def main():
     parser.add_option('--dashboard', default=False, action='store_true',
                       help='Use this instead of --robot to receive the IP from the driver station. WARNING: It will not work if you are not on the same host as the DS!')
 
+    parser.add_option('--identity', default='pynetworktables2js %s' % __version__, 
+                      help='Identity to broadcast to remote NT clients')
+        
     options, args = parser.parse_args()
 
     # Setup logging

pynetworktables2js/nt_serial.py

@@ -20,14 +20,7 @@ def __init__(self, update_callback):
         self.update_callback = update_callback
         self.nt = NetworkTable.getGlobalTable()
         NetworkTable.addGlobalListener(self._nt_on_change, immediateNotify=True)
-
-        class Empty:
-            pass
-        self.conn_listener = Empty()
-        self.conn_listener.connected = self._nt_connected
-        self.conn_listener.disconnected = self._nt_disconnected
-
-        self.nt.addConnectionListener(self.conn_listener, immediateNotify=True)
+        self.nt.addConnectionListener(self._nt_connected, immediateNotify=True)
 
     def process_update(self, update):
         """Process an incoming update from a remote NetworkTables"""
@@ -45,15 +38,13 @@ def _nt_on_change(self, key, value, isNew):
         self._send_update({'k': key, 'v': value, 'n': isNew})
 
     # NetworkTables connection listener callbacks
-    def _nt_connected(self, table):
-        self._send_update({'r': True, 'a': self.nt.getRemoteAddress()})
+    def _nt_connected(self, connected, info):
+        self._send_update({'r': connected, 'a': self.nt.getRemoteAddress()})
 
-    def _nt_disconnected(self, table):
-        self._send_update({'r': False, 'a': None})
 
     def close(self):
         """
         Clean up NetworkTables listeners
         """
         NetworkTable.removeGlobalListener(self._nt_on_change)
-        self.nt.removeConnectionListener(self.conn_listener)
+        self.nt.removeConnectionListener(self.conn_listener)

setup.py

@@ -42,7 +42,7 @@
 setup(
     name='pynetworktables2js',
     version=__version__,
-    description='RobotPy web-based low fidelity FRC robot simulation package',
+    description='Forwards NetworkTables traffic to a web page via a Websocket',
     long_description=long_description,
     author='RobotPy Development Team',
     author_email='[email protected]',
@@ -53,7 +53,7 @@
     zip_safe=False,
     install_requires=[
         'tornado>=4.0',
-        'pynetworktables>=2015.3.2'
+        'pynetworktables>=2017.0.0a1'
     ],
     entry_points={'console_scripts': [ 'pynetworktables2js = pynetworktables2js.__main__:main' ]},
     license="BSD License",