Web detection constant (googleapis#3073)

lukesneeringer · web-flow · commit 8f3881adb20e · 2017-02-25T16:15:29.000-08:00
diff --git a/vision/google/cloud/vision/annotations.py b/vision/google/cloud/vision/annotations.py
@@ -31,7 +31,7 @@
 _FULL_TEXT_ANNOTATION = 'fullTextAnnotation'
 _IMAGE_PROPERTIES_ANNOTATION = 'imagePropertiesAnnotation'
 _SAFE_SEARCH_ANNOTATION = 'safeSearchAnnotation'
-_WEB_ANNOTATION = 'webDetection'
+_WEB_DETECTION = 'webDetection'
 
 _KEY_MAP = {
     _CROP_HINTS_ANNOTATION: 'crop_hints',
@@ -43,7 +43,7 @@
     'logoAnnotations': 'logos',
     _SAFE_SEARCH_ANNOTATION: 'safe_searches',
     'textAnnotations': 'texts',
-    _WEB_ANNOTATION: 'web',
+    _WEB_DETECTION: 'web',
 }
 
 
@@ -275,7 +275,7 @@ def _entity_from_response_type(feature_type, results):
         return ImagePropertiesAnnotation.from_api_repr(results)
     elif feature_type == _SAFE_SEARCH_ANNOTATION:
         return SafeSearchAnnotation.from_api_repr(results)
-    elif feature_type == _WEB_ANNOTATION:
+    elif feature_type == _WEB_DETECTION:
         return WebDetection.from_api_repr(results)
     elif feature_type == _CROP_HINTS_ANNOTATION:
         crop_hints = results.get('cropHints', [])
diff --git a/vision/google/cloud/vision/feature.py b/vision/google/cloud/vision/feature.py
@@ -31,7 +31,7 @@ class FeatureTypes(object):
     TEXT_DETECTION = 'TEXT_DETECTION'
     SAFE_SEARCH_DETECTION = 'SAFE_SEARCH_DETECTION'
     IMAGE_PROPERTIES = 'IMAGE_PROPERTIES'
-    WEB_ANNOTATION = 'WEB_ANNOTATION'
+    WEB_DETECTION = 'WEB_DETECTION'
 
 
 class Feature(object):
diff --git a/vision/google/cloud/vision/image.py b/vision/google/cloud/vision/image.py
@@ -288,6 +288,6 @@ def detect_web(self, limit=10):
         :returns: List of
                   :class:`~google.cloud.vision.entity.EntityAnnotation`.
         """
-        features = [Feature(FeatureTypes.WEB_ANNOTATION, limit)]
+        features = [Feature(FeatureTypes.WEB_DETECTION, limit)]
         annotations = self.detect(features)
         return annotations[0].web
diff --git a/vision/setup.py b/vision/setup.py
@@ -57,7 +57,7 @@
 
 setup(
     name='google-cloud-vision',
-    version='0.23.1',
+    version='0.23.2',
     description='Python Client for Google Cloud Vision',
     long_description=README,
     namespace_packages=[
diff --git a/vision/unit_tests/_fixtures.py b/vision/unit_tests/_fixtures.py
@@ -1961,7 +1961,7 @@
 }
 
 
-WEB_ANNOTATION_RESPONSE = {
+WEB_DETECTION_RESPONSE = {
     'responses': [
         {
             'webDetection': {
diff --git a/vision/unit_tests/test_client.py b/vision/unit_tests/test_client.py
@@ -576,9 +576,9 @@ def test_detect_web_detection(self):
         from google.cloud.vision.web import WebEntity
         from google.cloud.vision.web import WebImage
         from google.cloud.vision.web import WebPage
-        from unit_tests._fixtures import WEB_ANNOTATION_RESPONSE
+        from unit_tests._fixtures import WEB_DETECTION_RESPONSE
 
-        returned = WEB_ANNOTATION_RESPONSE
+        returned = WEB_DETECTION_RESPONSE
         credentials = _make_credentials()
         client = self._make_one(project=PROJECT, credentials=credentials,
                                 use_gax=False)
@@ -604,7 +604,7 @@ def test_detect_web_detection(self):
                          IMAGE_SOURCE)
         self.assertEqual(image_request['features'][0]['maxResults'], 2)
         self.assertEqual(image_request['features'][0]['type'],
-                         'WEB_ANNOTATION')
+                         'WEB_DETECTION')
 
 
 class _Connection(object):

Original file line number	Diff line number	Diff line change
`@@ -1961,7 +1961,7 @@`
`1961`	`1961`	`}`
`1962`	`1962`
`1963`	`1963`
`1964`		`-WEB_ANNOTATION_RESPONSE = {`
	`1964`	`+WEB_DETECTION_RESPONSE = {`
`1965`	`1965`	`'responses': [`
`1966`	`1966`	`{`
`1967`	`1967`	`'webDetection': {`