Merged in package rename and updated imports.

Author: daspecster

google/cloud/vision/__init__.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 
 """Google Cloud Vision API package."""
-from gcloud.vision.client import Client
+from google.cloud.vision.client import Client

google/cloud/vision/client.py

@@ -113,7 +113,7 @@ def image(self, image_source):
         :type image_source: str or bytes
         :param image_source: Byte stream of an image or a GCS URI.
 
-        :rtype: :class:`gcloud.vision.image.Image`
+        :rtype: :class:`google.cloud.vision.image.Image`
         :returns: Image instance with the current client attached.
         """
         return Image(client=self, image_source=image_source)

google/cloud/vision/face.py

@@ -15,9 +15,9 @@
 """Face class representing the Vision API's face detection response."""
 
 
-from gcloud.vision.geometry import BoundsBase
-from gcloud.vision.likelihood import Likelihood
-from gcloud.vision.geometry import Position
+from google.cloud.vision.geometry import BoundsBase
+from google.cloud.vision.likelihood import Likelihood
+from google.cloud.vision.geometry import Position
 
 
 class Angles(object):
@@ -31,7 +31,7 @@ def __init__(self, roll, pan, tilt):
     def from_api_repr(cls, response):
         """Factory: construct the angles from an Vision API response.
 
-        :rtype: :class:`gcloud.vision.face.Angles`
+        :rtype: :class:`google.cloud.vision.face.Angles`
         :returns: An `Angles` instance with data parsed from `response`.
         """
         roll = response['rollAngle']
@@ -88,7 +88,7 @@ def from_api_repr(cls, response):
         :type response: dict
         :param response: Response dictionary representing a face.
 
-        :rtype: :class:`gcloud.vision.face.Emotions`
+        :rtype: :class:`google.cloud.vision.face.Emotions`
         :returns: Populated instance of `Emotions`.
         """
         joy_likelihood = getattr(Likelihood, response['joyLikelihood'])
@@ -105,7 +105,8 @@ def joy_likelihood(self):
         """Likelihood of joy in detected face.
 
         :rtype: str
-        :returns: String derived from :class:`gcloud.vision.face.Likelihood`.
+        :returns: String derived from
+                  :class:`google.cloud.vision.face.Likelihood`.
         """
         return self._joy_likelihood
 
@@ -114,7 +115,8 @@ def sorrow_likelihood(self):
         """Likelihood of sorrow in detected face.
 
         :rtype: str
-        :returns: String derived from :class:`gcloud.vision.face.Likelihood`.
+        :returns: String derived from
+                  :class:`google.cloud.vision.face.Likelihood`.
         """
         return self._sorrow_likelihood
 
@@ -123,7 +125,8 @@ def surprise_likelihood(self):
         """Likelihood of surprise in detected face.
 
         :rtype: str
-        :returns: String derived from :class:`gcloud.vision.face.Likelihood`.
+        :returns: String derived from
+                  :class:`google.cloud.vision.face.Likelihood`.
         """
         return self._surprise_likelihood
 
@@ -132,7 +135,8 @@ def anger_likelihood(self):
         """Likelihood of anger in detected face.
 
         :rtype: str
-        :returns: String derived from :class:`gcloud.vision.face.Likelihood`.
+        :returns: String derived from
+                  :class:`google.cloud.vision.face.Likelihood`.
         """
         return self._anger_likelihood
 
@@ -160,7 +164,7 @@ def from_api_repr(cls, response):
         :type response: dict
         :param response: Face annotation dict returned from the Vision API.
 
-        :rtype: :class:`gcloud.vision.face.Face`
+        :rtype: :class:`google.cloud.vision.face.Face`
         :returns: A instance of `Face` with data parsed from `response`.
         """
         angles = Angles.from_api_repr(response)
@@ -182,7 +186,7 @@ def from_api_repr(cls, response):
     def angles(self):
         """Accessor to the pan, tilt and roll angles of a Face.
 
-        :rtype: :class:`gcloud.vision.face.Angles`
+        :rtype: :class:`google.cloud.vision.face.Angles`
         :returns: Pan, tilt and roll angles of the detected face.
         """
 
@@ -192,7 +196,7 @@ def angles(self):
     def bounds(self):
         """Accessor to the bounding poly information of the detected face.
 
-        :rtype: :class:`gcloud.vision.face.Bounds`
+        :rtype: :class:`google.cloud.vision.face.Bounds`
         :returns: An instance of ``Bounds`` which has a list of vertices.
         """
         return self._bounds
@@ -210,7 +214,7 @@ def detection_confidence(self):
     def emotions(self):
         """Accessor to the possible emotions expressed in the detected face.
 
-        :rtype: :class:`gcloud.vision.face.Emotions`
+        :rtype: :class:`google.cloud.vision.face.Emotions`
         :returns: An instance of ``Emotions`` with joy, sorrow, anger, surprise
                   likelihood.
         """
@@ -220,7 +224,7 @@ def emotions(self):
     def fd_bounds(self):
         """Accessor to the skin area bounding poly of the detected face.
 
-        :rtype: :class:`gcloud.vision.image.FDBounds`
+        :rtype: :class:`google.cloud.vision.image.FDBounds`
         :returns: An instance of ``FDBounds`` which has a list of vertices.
         """
         return self._fd_bounds
@@ -229,17 +233,17 @@ def fd_bounds(self):
     def headwear_likelihood(self):
         """Headwear likelihood.
 
-        :rtype: :class:`gcloud.vision.face.Likelihood`
+        :rtype: :class:`google.cloud.vision.face.Likelihood`
         :returns: String representing the likelihood based on
-                  :class:`gcloud.vision.face.Likelihood`
+                  :class:`google.cloud.vision.face.Likelihood`
         """
         return self._headwear_likelihood
 
     @property
     def image_properties(self):
         """Image properties from imaged used in face detection.
 
-        :rtype: :class:`gcloud.vision.face.FaceImageProperties`
+        :rtype: :class:`google.cloud.vision.face.FaceImageProperties`
         :returns: ``FaceImageProperties`` object with image properties.
         """
         return self._image_properties
@@ -248,7 +252,7 @@ def image_properties(self):
     def landmarks(self):
         """Accessor to the facial landmarks detected in a face.
 
-        :rtype: :class:`gcloud.vision.face.Landmarks`
+        :rtype: :class:`google.cloud.vision.face.Landmarks`
         :returns: ``Landmarks`` object with facial landmarks as properies.
         """
         return self._landmarks
@@ -274,7 +278,7 @@ def __init__(self, blurred_likelihood, underexposed_likelihood):
     def from_api_repr(cls, response):
         """Factory: construct image properties from image.
 
-        :rtype: :class:`gcloud.vision.face.FaceImageProperties`
+        :rtype: :class:`google.cloud.vision.face.FaceImageProperties`
         :returns: Instance populated with image property data.
         """
         blurred_likelihood = getattr(Likelihood,
@@ -290,7 +294,7 @@ def blurred_likelihood(self):
 
         :rtype: str
         :returns: String representation derived from
-                  :class:`gcloud.vision.face.Position`.
+                  :class:`google.cloud.vision.face.Position`.
         """
         return self._blurred_likelihood
 
@@ -300,7 +304,7 @@ def underexposed_likelihood(self):
 
         :rtype: str
         :returns: String representation derived from
-                  :class:`gcloud.vision.face.Position`.
+                  :class:`google.cloud.vision.face.Position`.
         """
         return self._underexposed_likelihood
 
@@ -365,7 +369,7 @@ def from_api_repr(cls, response_landmark):
         :type response_landmark: dict
         :param response_landmark: Landmark representation from Vision API.
 
-        :rtype: :class:`gcloud.vision.face.Landmark`
+        :rtype: :class:`google.cloud.vision.face.Landmark`
         :returns: Populated instance of `Landmark`.
         """
         position = Position.from_api_repr(response_landmark['position'])
@@ -376,7 +380,7 @@ def from_api_repr(cls, response_landmark):
     def position(self):
         """Landmark position on face.
 
-        :rtype: :class:`gcloud.vision.face.Position`
+        :rtype: :class:`google.cloud.vision.face.Position`
         :returns: Instance of `Position` with landmark coordinates.
         """
         return self._position

google/cloud/vision/geometry.py

@@ -27,7 +27,7 @@ def from_api_repr(cls, response_vertices):
         :type response_vertices: dict
         :param response_vertices: List of vertices.
 
-        :rtype: :class:`gcloud.vision.geometry.BoundsBase`
+        :rtype: :class:`google.cloud.vision.geometry.BoundsBase`
         :returns: Instance of BoundsBase with populated verticies.
         """
         vertices = []
@@ -61,7 +61,7 @@ def __init__(self, x_coordinate, y_coordinate, z_coordinate):
     def from_api_repr(cls, response_position):
         """Factory: construct 3D position from API response.
 
-        :rtype: :class:`gcloud.vision.geometry.Position`
+        :rtype: :class:`google.cloud.vision.geometry.Position`
         :returns: `Position` constructed with 3D points from API response.
         """
         x_coordinate = response_position['x']

google/cloud/vision/image.py

@@ -87,7 +87,7 @@ def detect_faces(self, limit=10):
         :param limit: The number of faces to try and detect.
 
         :rtype: list
-        :returns: List of :class:`gcloud.vision.face.Face`.
+        :returns: List of :class:`google.cloud.vision.face.Face`.
         """
         faces = []
         face_detection_feature = Feature(FeatureTypes.FACE_DETECTION, limit)

unit_tests/vision/test_client.py

@@ -62,8 +62,6 @@ def test_face_annotation(self):
         client = self._makeOne(project=self.PROJECT, credentials=credentials)
         client.connection = _Connection(RETURNED)
 
-        from google.cloud.vision.feature import Feature, FeatureTypes
-
         features = [Feature(feature_type=FeatureTypes.FACE_DETECTION,
                             max_results=3)]
         image = client.image(_IMAGE_CONTENT)
@@ -84,7 +82,8 @@ def test_image_with_client(self):
 
     def test_face_detection_from_source(self):
         from google.cloud.vision.face import Face
-        from google.cloud.vision._fixtures import FACE_DETECTION_RESPONSE as RETURNED
+        from google.cloud.vision._fixtures import FACE_DETECTION_RESPONSE
+        RETURNED = FACE_DETECTION_RESPONSE
         credentials = _Credentials()
         client = self._makeOne(project=self.PROJECT, credentials=credentials)
         client.connection = _Connection(RETURNED)
@@ -100,7 +99,8 @@ def test_face_detection_from_source(self):
 
     def test_face_detection_from_content(self):
         from google.cloud.vision.face import Face
-        from google.cloud.vision._fixtures import FACE_DETECTION_RESPONSE as RETURNED
+        from google.cloud.vision._fixtures import FACE_DETECTION_RESPONSE
+        RETURNED = FACE_DETECTION_RESPONSE
         credentials = _Credentials()
         client = self._makeOne(project=self.PROJECT, credentials=credentials)
         client.connection = _Connection(RETURNED)