digidotcom · posborne · Nov 20, 2015 · Nov 20, 2015 · Nov 20, 2015
diff --git a/HACKING.md b/HACKING.md
@@ -97,5 +97,4 @@ Each source file should be prefixed with the following header:
     # License, v. 2.0. If a copy of the MPL was not distributed with this
     # file, You can obtain one at http://mozilla.org/MPL/2.0/.
     #
-    # Copyright (c) 2015 Etherios, Inc. All rights reserved.
-    # Etherios, Inc. is a Division of Digi International.
+    # Copyright (c) 2015 Digi International, Inc. All rights reserved.
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ Overview
 --------
 
 Python-devicecloud is a library providing simple, intuitive access to
-the [Digi Device Cloud](http://www.digi.com/cloud/digi-device-cloud)
+the [Digi Device Cloud](http://www.digi.com/products/cloud/digi-device-cloud)
 for clients written in Python.
 
 The library wraps the Device Cloud REST API and hides the details of
@@ -28,7 +28,7 @@ The primary target audience for this library is individuals
 interfacing with the device cloud from the server side or developers
 writing tools to aid device development.  For efficient connectivity
 from devices, we suggest that you first look at using the [Device Cloud
-Connector](http://www.etherios.com/products/devicecloud/connector).
+Connector](http://www.digi.com/support/productdetail?pid=5575).
 That being said, this library could also be used on devices if deemed
 suitable.
 
@@ -159,9 +159,7 @@ This Source Code Form is subject to the terms of the Mozilla Public
 License, v. 2.0. If a copy of the MPL was not distributed with this file,
 you can obtain one at http://mozilla.org/MPL/2.0/.
 
-Digi, Digi International, the Digi logo, the Digi website, Etherios,
-the Etherios logo, the Etherios website, Device Cloud by Etherios, and
-Etherios Cloud Connector are trademarks or registered trademarks of
+Digi, Digi International, the Digi logo, the Digi website, Digi Device Cloud, and Digi Cloud Connector are trademarks or registered trademarks of
 Digi International, Inc. in the United States and other countries
 worldwide. All other trademarks are the property of their respective
 owners.

diff --git a/devicecloud/__init__.py b/devicecloud/__init__.py
@@ -355,7 +355,7 @@ def __init__(self, username, password, base_url=None,
                  throttle_delay_max=DEFAULT_THROTTLE_DELAY_MAX,
                  throttle_delay_backoff_coefficient=DEFAULT_THROTTLE_DELAY_BACKOFF_COEFFICIENT):
         if base_url is None:
-            base_url = "https://login.etherios.com"
+            base_url = "https://devicecloud.digi.com"
         self._conn = DeviceCloudConnection(
             auth=HTTPBasicAuth(username, password),
             base_url=base_url,

diff --git a/devicecloud/devicecore.py b/devicecloud/devicecore.py
@@ -325,8 +325,8 @@ def __init__(self, group_id, name, description, path, parent_id):
     def from_json(cls, json_data):
         """Build and return a new Group object from json data (used internally)"""
         # Example Data:
-        # { "grpId": "11817", "grpName": "7603_Etherios", "grpDescription": "7603_Etherios root group",
-        #   "grpPath": "\/7603_Etherios\/", "grpParentId": "1"}
+        # { "grpId": "11817", "grpName": "7603_Digi", "grpDescription": "7603_Digi root group",
+        #   "grpPath": "\/7603_Digi\/", "grpParentId": "1"}
         return cls(
             group_id=json_data["grpId"],
             name=json_data["grpName"],

diff --git a/devicecloud/examples/example_helpers.py b/devicecloud/examples/example_helpers.py
@@ -11,7 +11,7 @@
 
 def get_authenticated_dc():
     while True:
-        base_url = os.environ.get('DC_BASE_URL', 'https://login.etherios.com')
+        base_url = os.environ.get('DC_BASE_URL', 'https://devicecloud.digi.com')
 
         username = os.environ.get('DC_USERNAME', None)
         if not username:

diff --git a/devicecloud/test/integration/__init__.py b/devicecloud/test/integration/__init__.py
@@ -2,5 +2,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Copyright (c) 2015 Etherios, Inc. All rights reserved.
-# Etherios, Inc. is a Division of Digi International.
+# Copyright (c) 2015 Digi International, Inc. All rights reserved.
diff --git a/devicecloud/test/integration/inttest_monitor_tcp.py b/devicecloud/test/integration/inttest_monitor_tcp.py
@@ -42,7 +42,7 @@ def receive_notification(notification):
                 fd = msg.get('FileData', None)
                 if fd:
                     if (fd['id']['fdName'] == 'test_file.txt' and
-                            fd['id']['fdPath'] == '/db/7603_Etherios/inttest/monitor_tcp/'):
+                            fd['id']['fdPath'] == '/db/7603_Digi/inttest/monitor_tcp/'):
                         fd_push_seen = True
                 dp = msg.get('DataPoint')
                 if dp:

diff --git a/devicecloud/test/integration/inttest_streams.py b/devicecloud/test/integration/inttest_streams.py
@@ -2,8 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Copyright (c) 2015 Etherios, Inc. All rights reserved.
-# Etherios, Inc. is a Division of Digi International.
+# Copyright (c) 2015 Digi International, Inc. All rights reserved.
 
 """Integration tests for streams functionality
 

diff --git a/devicecloud/test/integration/inttest_utilities.py b/devicecloud/test/integration/inttest_utilities.py
@@ -2,8 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Copyright (c) 2015 Etherios, Inc. All rights reserved.
-# Etherios, Inc. is a Division of Digi International.
+# Copyright (c) 2015 Digi International, Inc. All rights reserved.
 
 from getpass import getpass
 import unittest

diff --git a/devicecloud/test/unit/__init__.py b/devicecloud/test/unit/__init__.py
@@ -2,5 +2,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Copyright (c) 2015 Etherios, Inc. All rights reserved.
-# Etherios, Inc. is a Division of Digi International.
+# Copyright (c) 2015 Digi International, Inc. All rights reserved.
diff --git a/devicecloud/test/unit/test_devicecore.py b/devicecloud/test/unit/test_devicecore.py
@@ -120,8 +120,8 @@
   "requestedSize": "1000",
   "remainingSize": "0",
   "items": [
-    { "grpId": "11817", "grpName": "7603_Etherios", "grpDescription": "7603_Etherios root group", "grpPath": "\/7603_Etherios\/", "grpParentId": "1"},
-    { "grpId": "13542", "grpName": "Demo", "grpPath": "\/7603_Etherios\/Demo\/", "grpParentId": "11817"}
+    { "grpId": "11817", "grpName": "7603_Digi", "grpDescription": "7603_Digi root group", "grpPath": "\/7603_Digi\/", "grpParentId": "1"},
+    { "grpId": "13542", "grpName": "Demo", "grpPath": "\/7603_Digi\/Demo\/", "grpParentId": "11817"}
   ]
 }
 """
@@ -134,10 +134,10 @@
   "requestedSize": "1000",
   "remainingSize": "0",
   "items": [
-    { "grpId": "11817", "grpName": "7603_Etherios", "grpDescription": "7603_Etherios root group", "grpPath": "\/7603_Etherios\/", "grpParentId": "1"},
-    { "grpId": "13542", "grpName": "Demo", "grpPath": "\/7603_Etherios\/Demo\/", "grpParentId": "11817"},
-    { "grpId": "13544", "grpName": "SubDir2", "grpPath": "\/7603_Etherios\/Demo\/SubDir2\/", "grpParentId": "13542"},
-    { "grpId": "13545", "grpName": "Another Second Level", "grpDescription": "Another Second Level", "grpPath": "\/7603_Etherios\/Another Second Level\/", "grpParentId": "11817"}
+    { "grpId": "11817", "grpName": "7603_Digi", "grpDescription": "7603_Digi root group", "grpPath": "\/7603_Digi\/", "grpParentId": "1"},
+    { "grpId": "13542", "grpName": "Demo", "grpPath": "\/7603_Digi\/Demo\/", "grpParentId": "11817"},
+    { "grpId": "13544", "grpName": "SubDir2", "grpPath": "\/7603_Digi\/Demo\/SubDir2\/", "grpParentId": "13542"},
+    { "grpId": "13545", "grpName": "Another Second Level", "grpDescription": "Another Second Level", "grpPath": "\/7603_Digi\/Another Second Level\/", "grpParentId": "11817"}
   ]
 }
 """
@@ -181,17 +181,17 @@ def test_get_groups(self):
         grp = six.next(it)
         self.assertEqual(grp.is_root(), True)
         self.assertEqual(grp.get_id(), "11817")
-        self.assertEqual(grp.get_name(), "7603_Etherios")
-        self.assertEqual(grp.get_description(), "7603_Etherios root group")
-        self.assertEqual(grp.get_path(), "/7603_Etherios/")
+        self.assertEqual(grp.get_name(), "7603_Digi")
+        self.assertEqual(grp.get_description(), "7603_Digi root group")
+        self.assertEqual(grp.get_path(), "/7603_Digi/")
         self.assertEqual(grp.get_parent_id(), "1")
 
         grp = six.next(it)
         self.assertEqual(grp.is_root(), False)
         self.assertEqual(grp.get_id(), "13542")
         self.assertEqual(grp.get_name(), "Demo")
         self.assertEqual(grp.get_description(), "")
-        self.assertEqual(grp.get_path(), "/7603_Etherios/Demo/")
+        self.assertEqual(grp.get_path(), "/7603_Digi/Demo/")
         self.assertEqual(grp.get_parent_id(), "11817")
 
     def test_repr_and_tree_print(self):
@@ -200,9 +200,9 @@ def test_repr_and_tree_print(self):
         root = self.dc.devicecore.get_group_tree_root()
         root.print_subtree(fobj)  # the order of the traversal can vary, so just assert on the length
         if six.PY2:
-            self.assertEqual(len(fobj.getvalue()), 513)
+            self.assertEqual(len(fobj.getvalue()), 489)
         elif six.PY3:
-            self.assertEqual(len(fobj.getvalue()), 495)  # no u'' on repr for strings
+            self.assertEqual(len(fobj.getvalue()), 471)  # no u'' on repr for strings
 
     def test_get_groups_condition(self):
         self.prepare_response("GET",  "/ws/Group", EXAMPLE_GET_GROUPS)

diff --git a/devicecloud/test/unit/test_monitor_tcp.py b/devicecloud/test/unit/test_monitor_tcp.py
@@ -20,7 +20,7 @@ def setUp(self):
         self.client_manager = TCPClientManager(self.dc.get_connection())
 
     def test_hostname(self):
-        self.assertEqual(self.client_manager.hostname, "login.etherios.com")
+        self.assertEqual(self.client_manager.hostname, "devicecloud.digi.com")
 
     def test_username(self):
         self.assertEqual(self.client_manager.username, "user")

diff --git a/devicecloud/test/unit/test_utilities.py b/devicecloud/test/unit/test_utilities.py
@@ -38,7 +38,7 @@ def prepare_response(self, method, path, data=None, status=200, match_querystrin
         if data is not None:
             kwargs['body'] = data
         httpretty.register_uri(method,
-                               "https://login.etherios.com{}".format(path),
+                               "https://devicecloud.digi.com{}".format(path),
                                match_querystring=match_querystring,
                                status=status,
                                **kwargs)

diff --git a/devicecloud/ws.py b/devicecloud/ws.py
@@ -2,8 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Copyright (c) 2015 Etherios, Inc. All rights reserved.
-# Etherios, Inc. is a Division of Digi International.
+# Copyright (c) 2015 Digi International, Inc. All rights reserved.
 import functools
 import inspect
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -55,7 +55,7 @@
 
 # General information about the project.
 project = u'python-devicecloud'
-copyright = u'2014, Etherios, Inc.'
+copyright = u'2015, Digi International, Inc.'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

diff --git a/docs/index.rst b/docs/index.rst
@@ -21,8 +21,8 @@ Introduction
 ============
 
 Python-devicecloud is a library providing simple, intuitive access to
-the `Device Cloud by Etherios
-<http://www.etherios.com/products/devicecloud/>`_ for clients written
+the `Digi Device Cloud
+<http://www.digi.com/products/cloud/digi-device-cloud/>`_ for clients written
 in Python.
 
 The library wraps the Device Cloud REST API and hides the details of
@@ -36,7 +36,7 @@ The primary target audience for this library is individuals
 interfacing with the device cloud from the server side or developers
 writing tools to aid device development.  For efficient connectivity
 from devices, we suggest that you first look at using the `Device
-Cloud Connector <http://www.etherios.com/products/devicecloud/connector>`_.
+Cloud Connector <http://www.digi.com/support/productdetail?pid=5575>`_.
 That being said, this library could also be used on devices if deemed
 suitable.