From 7f306cae0e3a225be94eb89500b99674c02ebb6f Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Tue, 24 Apr 2018 09:23:55 -0700
Subject: [PATCH] Rename histogram module

---
 .../{_histogram.py => _protocol/histogram.py}  |  0
 .../cloud/pubsub_v1/subscriber/policy/base.py  |  4 ++--
 .../pubsub_v1/subscriber/test_histogram.py     | 18 +++++++++---------
 .../unit/pubsub_v1/subscriber/test_leaser.py   |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)
 rename pubsub/google/cloud/pubsub_v1/subscriber/{_histogram.py => _protocol/histogram.py} (100%)

diff --git a/pubsub/google/cloud/pubsub_v1/subscriber/_histogram.py b/pubsub/google/cloud/pubsub_v1/subscriber/_protocol/histogram.py
similarity index 100%
rename from pubsub/google/cloud/pubsub_v1/subscriber/_histogram.py
rename to pubsub/google/cloud/pubsub_v1/subscriber/_protocol/histogram.py
diff --git a/pubsub/google/cloud/pubsub_v1/subscriber/policy/base.py b/pubsub/google/cloud/pubsub_v1/subscriber/policy/base.py
index 48ef35e7e113..82122cea83d8 100644
--- a/pubsub/google/cloud/pubsub_v1/subscriber/policy/base.py
+++ b/pubsub/google/cloud/pubsub_v1/subscriber/policy/base.py
@@ -28,7 +28,7 @@
 
 from google.cloud.pubsub_v1 import types
 from google.cloud.pubsub_v1.subscriber import _consumer
-from google.cloud.pubsub_v1.subscriber import _histogram
+from google.cloud.pubsub_v1.subscriber._protocol import histogram
 
 
 _LOGGER = logging.getLogger(__name__)
@@ -114,7 +114,7 @@ def __init__(self, client, subscription,
         self._last_histogram_size = 0
         self._future = None
         self.flow_control = flow_control
-        self.histogram = _histogram.Histogram(data=histogram_data)
+        self.histogram = histogram.Histogram(data=histogram_data)
         """.Histogram: the histogram tracking ack latency."""
         self.leased_messages = {}
         """dict[str, float]: A mapping of ack IDs to the local time when the
diff --git a/pubsub/tests/unit/pubsub_v1/subscriber/test_histogram.py b/pubsub/tests/unit/pubsub_v1/subscriber/test_histogram.py
index e3c0e55dbaaf..d3c15cdcee9c 100644
--- a/pubsub/tests/unit/pubsub_v1/subscriber/test_histogram.py
+++ b/pubsub/tests/unit/pubsub_v1/subscriber/test_histogram.py
@@ -12,18 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from google.cloud.pubsub_v1.subscriber import _histogram
+from google.cloud.pubsub_v1.subscriber._protocol import histogram
 
 
 def test_init():
     data = {}
-    histo = _histogram.Histogram(data=data)
+    histo = histogram.Histogram(data=data)
     assert histo._data is data
     assert len(histo) == 0
 
 
 def test_contains():
-    histo = _histogram.Histogram()
+    histo = histogram.Histogram()
     histo.add(10)
     histo.add(20)
     assert 10 in histo
@@ -32,7 +32,7 @@ def test_contains():
 
 
 def test_max():
-    histo = _histogram.Histogram()
+    histo = histogram.Histogram()
     assert histo.max == 600
     histo.add(120)
     assert histo.max == 120
@@ -43,7 +43,7 @@ def test_max():
 
 
 def test_min():
-    histo = _histogram.Histogram()
+    histo = histogram.Histogram()
     assert histo.min == 10
     histo.add(60)
     assert histo.min == 60
@@ -54,7 +54,7 @@ def test_min():
 
 
 def test_add():
-    histo = _histogram.Histogram()
+    histo = histogram.Histogram()
     histo.add(60)
     assert histo._data[60] == 1
     histo.add(60)
@@ -62,21 +62,21 @@ def test_add():
 
 
 def test_add_lower_limit():
-    histo = _histogram.Histogram()
+    histo = histogram.Histogram()
     histo.add(5)
     assert 5 not in histo
     assert 10 in histo
 
 
 def test_add_upper_limit():
-    histo = _histogram.Histogram()
+    histo = histogram.Histogram()
     histo.add(12000)
     assert 12000 not in histo
     assert 600 in histo
 
 
 def test_percentile():
-    histo = _histogram.Histogram()
+    histo = histogram.Histogram()
     [histo.add(i) for i in range(101, 201)]
     assert histo.percentile(100) == 200
     assert histo.percentile(101) == 200
diff --git a/pubsub/tests/unit/pubsub_v1/subscriber/test_leaser.py b/pubsub/tests/unit/pubsub_v1/subscriber/test_leaser.py
index 571e56f6b61a..c2cdde4bafd9 100644
--- a/pubsub/tests/unit/pubsub_v1/subscriber/test_leaser.py
+++ b/pubsub/tests/unit/pubsub_v1/subscriber/test_leaser.py
@@ -16,8 +16,8 @@
 import threading
 
 from google.cloud.pubsub_v1 import types
-from google.cloud.pubsub_v1.subscriber import _histogram
 from google.cloud.pubsub_v1.subscriber import subscriber
+from google.cloud.pubsub_v1.subscriber._protocol import histogram
 from google.cloud.pubsub_v1.subscriber._protocol import leaser
 from google.cloud.pubsub_v1.subscriber._protocol import requests
 
@@ -87,7 +87,7 @@ def create_subscriber(flow_control=types.FlowControl()):
     subscriber_ = mock.create_autospec(subscriber.Subscriber, instance=True)
     subscriber_.is_active = True
     subscriber_.flow_control = flow_control
-    subscriber_.ack_histogram = _histogram.Histogram()
+    subscriber_.ack_histogram = histogram.Histogram()
     return subscriber_