Fix style

Author: liyanhui1228

trace/google/cloud/trace/_gax.py

@@ -131,7 +131,7 @@ def list_traces(
                            passed, the API will return the first page of
                            entries.
 
-        :rtype: dict
+        :rtype: :class:`~google.cloud.iterator.Iterator`
         :returns: Traces that match the specified filter conditions.
         """
         if page_token is None:
@@ -187,7 +187,7 @@ def make_gax_trace_api(client):
     :param client: The client that holds configuration details.
 
     :rtype: :class:`~google.cloud.trace._gax._TraceAPI`
-    :return: A Trace API instance with the proper configurations.
+    :returns: A Trace API instance with the proper configurations.
     """
     channel = make_secure_channel(
         client._credentials,
@@ -206,7 +206,7 @@ def _traces_mapping_to_pb(traces_mapping):
     :param traces_mapping: A trace mapping.
 
     :rtype: class:`google.cloud.proto.devtools.cloudtrace.v1.trace_pb2.Traces`
-    :return: The converted protobuf type traces.
+    :returns: The converted protobuf type traces.
     """
     traces_pb = trace_pb2.Traces()
     ParseDict(traces_mapping, traces_pb)

trace/google/cloud/trace/client.py

@@ -61,7 +61,7 @@ def trace(self, project_id=None, trace_id=None):
         :param trace_id: ID of the trace. 32 digits uuid.
 
         :rtype: :class:`~google.cloud.trace.trace.Trace`
-        :return: A Trace instance.
+        :returns: A Trace instance.
         """
         if project_id is None:
             project_id = self.project
@@ -85,7 +85,7 @@ def patch_traces(self, traces, project_id=None, options=None):
         if project_id is None:
             project_id = self.project
 
-        return self.trace_api.patch_traces(
+        self.trace_api.patch_traces(
             project_id=project_id,
             traces=traces,
             options=options)
@@ -104,7 +104,7 @@ def get_trace(self, trace_id, project_id=None, options=None):
         :param options: (Optional) Overrides the default settings for this
                         call, e.g, timeout, retries etc.
 
-        :rtype: :dict
+        :rtype: dict
         :returns: A Trace dict.
         """
         if project_id is None:
@@ -163,7 +163,7 @@ def list_traces(
                            passed, the API will return the first page of
                            entries.
 
-        :rtype: dict
+        :rtype: :class:`~google.cloud.iterator.Iterator`
         :returns: Traces that match the specified filter conditions.
         """
         if project_id is None:

trace/google/cloud/trace/trace.py

@@ -74,7 +74,7 @@ def span(self, name='span'):
         """Create a new span for the trace and append it to the spans list.
 
         :type name: str
-        :param name: The name of the span.
+        :param name: (Optional) The name of the span.
 
         :rtype: :class:`~google.cloud.trace.trace_span.TraceSpan`
         :returns: A TraceSpan to be added to the current Trace.
@@ -114,8 +114,6 @@ def send(self):
             traces=traces,
             options=None)
 
-        return spans_list
-
 
 def generate_trace_id():
     """Generate a trace_id randomly.

trace/google/cloud/trace/trace_span.py

@@ -43,8 +43,8 @@ class TraceSpan(object):
                  distinguished using RPC_CLIENT and RPC_SERVER to identify
                  queueing latency associated with the span.
 
-    :type parent_span_id: str
-    :param parent_span_id: ID of the parent span. Optional.
+    :type parent_span_id: int
+    :param parent_span_id: (Optional) ID of the parent span.
 
     :type labels: dict
     :param labels: Collection of labels associated with the span.
@@ -60,7 +60,7 @@ class TraceSpan(object):
     :param end_time: (Optional) End of the time interval (inclusive) during
                      which the trace data was collected from the application.
 
-    :type span_id: str
+    :type span_id: int
     :param span_id: Identifier for the span, unique within a trace.
     """
 

trace/nox.py

@@ -52,7 +52,7 @@ def lint(session):
     Returns a failure if flake8 finds linting errors or sufficiently
     serious code quality issues.
     """
-    session.interpreter = 'python3.6'
+    session.interpreter = 'python2.7'
     session.install('flake8', *LOCAL_DEPS)
     session.install('.')
     session.run('flake8', 'google/cloud/trace')
@@ -73,7 +73,7 @@ def cover(session):
     This outputs the coverage report aggregating coverage from the unit
     test runs (not system test runs), and then erases coverage data.
     """
-    session.interpreter = 'python3.6'
+    session.interpreter = 'python2.7'
     session.install('coverage', 'pytest-cov')
     session.run('coverage', 'report', '--show-missing', '--fail-under=100')
     session.run('coverage', 'erase')

trace/tests/unit/test_client.py

@@ -91,44 +91,42 @@ def test_trace_explicit(self):
     def test_patch_traces_default(self):
         from google.cloud.trace._gax import _TraceAPI
 
-        def patch_traces(traces, project_id=None, options=None):
-            _patch_traces_called_with = (traces, project_id, options)
-            return _patch_traces_called_with
-
         credentials = _make_credentials()
         client = self._make_one(project=self.project, credentials=credentials)
         traces = 'fake_traces_for_test'
 
         mock_trace_api = mock.Mock(spec=_TraceAPI)
-        mock_trace_api.patch_traces = patch_traces
+        mock_trace_api.patch_traces = mock.Mock()
         patch = mock.patch('google.cloud.trace.client.make_gax_trace_api', return_value=mock_trace_api)
 
         with patch:
-            patch_traces_called_with = client.patch_traces(traces=traces)
+            client.patch_traces(traces=traces)
 
-        self.assertEqual(patch_traces_called_with, (traces, self.project, None))
+        mock_trace_api.patch_traces.assert_called_with(
+            options=None,
+            project_id='PROJECT',
+            traces='fake_traces_for_test')
 
     def test_patch_traces_explicit(self):
         from google.cloud.trace._gax import _TraceAPI
 
-        def patch_traces(traces, project_id=None, options=None):
-            _patch_traces_called_with = (traces, project_id, options)
-            return _patch_traces_called_with
-
         credentials = _make_credentials()
         client = self._make_one(project=self.project, credentials=credentials)
         traces = 'fake_traces_for_test'
 
         mock_trace_api = mock.Mock(spec=_TraceAPI)
-        mock_trace_api.patch_traces = patch_traces
+        mock_trace_api.patch_traces = mock.Mock()
         patch = mock.patch('google.cloud.trace.client.make_gax_trace_api', return_value=mock_trace_api)
 
         with patch:
-            patch_traces_called_with = client.patch_traces(
+            client.patch_traces(
                 project_id=self.project,
                 traces=traces)
 
-        self.assertEqual(patch_traces_called_with, (traces, self.project, None))
+        mock_trace_api.patch_traces.assert_called_with(
+            options=None,
+            project_id='PROJECT',
+            traces='fake_traces_for_test')
 
     def test_get_trace_default(self):
         from google.cloud.trace._gax import _TraceAPI