Fixing up drift from master.

dhermes · dhermes · commit 7fb0e97fb0c5 · 2016-08-11T15:53:29.000-07:00
diff --git a/docs/index.rst b/docs/index.rst
@@ -122,6 +122,7 @@
   :caption: Stackdriver Error Reporting
 
   error-reporting-usage
+  Client <error-reporting-client>
 
 .. toctree::
   :maxdepth: 0
diff --git a/docs/logging-usage.rst b/docs/logging-usage.rst
@@ -454,4 +454,3 @@ The Python logging handler can use different transports. The default is
 
  1. :class:`gcloud.logging.handlers.SyncTransport` this handler does a direct API call on each
  logging statement to write the entry.
-
diff --git a/gcloud/logging/handlers/test_handlers.py b/gcloud/logging/handlers/test_handlers.py
@@ -13,11 +13,10 @@
 # limitations under the License.
 
 import logging
+import unittest
 
-import unittest2
 
-
-class TestCloudLoggingHandler(unittest2.TestCase):
+class TestCloudLoggingHandler(unittest.TestCase):
 
     PROJECT = 'PROJECT'
 
@@ -44,7 +43,7 @@ def test_emit(self):
         self.assertEqual(handler.transport.send_called_with, (record, MESSAGE))
 
 
-class TestSetupLogging(unittest2.TestCase):
+class TestSetupLogging(unittest.TestCase):
 
     def _callFUT(self, handler, excludes=None):
         from gcloud.logging.handlers.handlers import setup_logging
diff --git a/gcloud/logging/handlers/transports/test_background_thread.py b/gcloud/logging/handlers/transports/test_background_thread.py
@@ -14,11 +14,10 @@
 
 import logging
 import time
+import unittest
 
-import unittest2
 
-
-class TestBackgroundThreadHandler(unittest2.TestCase):
+class TestBackgroundThreadHandler(unittest.TestCase):
 
     PROJECT = 'PROJECT'
 
@@ -56,7 +55,7 @@ def test_send(self):
                          EXPECTED_SENT)
 
 
-class TestWorker(unittest2.TestCase):
+class TestWorker(unittest.TestCase):
 
     def _getTargetClass(self):
         from gcloud.logging.handlers.transports.background_thread import (
diff --git a/gcloud/logging/handlers/transports/test_base.py b/gcloud/logging/handlers/transports/test_base.py
@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import unittest2
+import unittest
 
 
-class TestBaseHandler(unittest2.TestCase):
+class TestBaseHandler(unittest.TestCase):
 
     PROJECT = 'PROJECT'
 
diff --git a/gcloud/logging/handlers/transports/test_sync.py b/gcloud/logging/handlers/transports/test_sync.py
@@ -13,11 +13,10 @@
 # limitations under the License.
 
 import logging
+import unittest
 
-import unittest2
 
-
-class TestSyncHandler(unittest2.TestCase):
+class TestSyncHandler(unittest.TestCase):
 
     PROJECT = 'PROJECT'
 
diff --git a/system_tests/logging_.py b/system_tests/logging_.py
@@ -148,7 +148,7 @@ def test_log_handler_async(self):
         cloud_logger = logging.getLogger(handler.name)
         cloud_logger.addHandler(handler)
         cloud_logger.warn(LOG_MESSAGE)
-        entries, _ = _retry_backoff(_has_entries, logger.list_entries)
+        entries, _ = self._list_entries(logger)
         JSON_PAYLOAD = {
             'message': LOG_MESSAGE,
             'python_logger': handler.name
@@ -167,7 +167,7 @@ def test_log_handler_sync(self):
         logger = Config.CLIENT.logger(handler.name)
         self.to_delete.append(logger)
 
-        LOGGER_NAME = "mylogger"
+        LOGGER_NAME = 'mylogger'
         cloud_logger = logging.getLogger(LOGGER_NAME)
         cloud_logger.addHandler(handler)
         cloud_logger.warn(LOG_MESSAGE)

Original file line number	Diff line number	Diff line change
`@@ -454,4 +454,3 @@ The Python logging handler can use different transports. The default is`
`454`	`454`
`455`	`455`	1. :class:`gcloud.logging.handlers.SyncTransport` this handler does a direct API call on each
`456`	`456`	`logging statement to write the entry.`
`457`		`-`