py_tasks_melange: comparison thirdparty/google_appengine/google/appengine/api/images/__init_

equal deleted inserted replaced

-:5c931bd3dc1e
+:a7766286a7be
 JPEG = images_service_pb.OutputSettings.JPEG
 PNG = images_service_pb.OutputSettings.PNG
 OUTPUT_ENCODING_TYPES = frozenset([JPEG, PNG])
+MAX_TRANSFORMS_PER_REQUEST = 10
 class Error(Exception):
 """Base error class for this module."""
 if not image_data:
 raise NotImageError("Empty image data.")
 self._image_data = image_data
 self._transforms = []
-self._transform_map = {}
 self._width = None
 self._height = None
-def _check_transform_limits(self, transform):
+def _check_transform_limits(self):
 """Ensure some simple limits on the number of transforms allowed.
-Args:
+Raises:
-transform: images_service_pb.ImagesServiceTransform, enum of the
+BadRequestError if MAX_TRANSFORMS_PER_REQUEST transforms have already been
-trasnform called.
+requested for this image
+"""
-Raises:
+if len(self._transforms) >= MAX_TRANSFORMS_PER_REQUEST:
-BadRequestError if the transform has already been requested for the image.
+raise BadRequestError("%d transforms have already been requested on this "
-"""
+"image." % MAX_TRANSFORMS_PER_REQUEST)
-if not images_service_pb.ImagesServiceTransform.Type_Name(transform):
-raise BadRequestError("'%s' is not a valid transform." % transform)
-if transform in self._transform_map:
-transform_name = images_service_pb.ImagesServiceTransform.Type_Name(
-transform)
-raise BadRequestError("A '%s' transform has already been "
-"requested on this image." % transform_name)
-self._transform_map[transform] = True
 def _update_dimensions(self):
 """Updates the width and height fields of the image.
 Raises:
 while offset < size and ord(self._image_data[offset]) == 0xFF:
 offset += 1
 if (offset < size and ord(self._image_data[offset]) & 0xF0 == 0xC0 and
 ord(self._image_data[offset]) != 0xC4):
 offset += 4
-if offset + 4 < size:
+if offset + 4 <= size:
 self._height, self._width = struct.unpack(
 ">HH",
 self._image_data[offset:offset + 4])
 break
 else:
 raise BadImageError("Corrupt JPEG format")
-elif offset + 2 <= size:
+elif offset + 3 <= size:
 offset += 1
 offset += struct.unpack(">H", self._image_data[offset:offset + 2])[0]
 else:
 raise BadImageError("Corrupt JPEG format")
 if self._height is None or self._width is None:
 if self._image_data.startswith("II"):
 endianness = "<"
 else:
 endianness = ">"
 ifd_offset = struct.unpack(endianness + "I", self._image_data[4:8])[0]
-if ifd_offset < size + 14:
+if ifd_offset + 14 <= size:
 ifd_size = struct.unpack(
 endianness + "H",
 self._image_data[ifd_offset:ifd_offset + 2])[0]
 ifd_offset += 2
 for unused_i in range(0, ifd_size):
 height: int, height (in pixels) to change the image height to.
 Raises:
 TypeError when width or height is not either 'int' or 'long' types.
 BadRequestError when there is something wrong with the given height or
-width or if a Resize has already been requested on this image.
+width or if MAX_TRANSFORMS_PER_REQUEST transforms have already been
+requested on this image.
 """
 if (not isinstance(width, (int, long)) or
 not isinstance(height, (int, long))):
 raise TypeError("Width and height must be integers.")
 if width < 0 or height < 0:
 raise BadRequestError("At least one of width or height must be > 0.")
 if width > 4000 or height > 4000:
 raise BadRequestError("Both width and height must be < 4000.")
-self._check_transform_limits(
+self._check_transform_limits()
-images_service_pb.ImagesServiceTransform.RESIZE)
 transform = images_service_pb.Transform()
 transform.set_width(width)
 transform.set_height(height)
 degrees: int, must be a multiple of 90.
 Raises:
 TypeError when degrees is not either 'int' or 'long' types.
 BadRequestError when there is something wrong with the given degrees or
-if a Rotate trasnform has already been requested.
+if MAX_TRANSFORMS_PER_REQUEST transforms have already been requested.
 """
 if not isinstance(degrees, (int, long)):
 raise TypeError("Degrees must be integers.")
 if degrees % 90 != 0:
 raise BadRequestError("degrees argument must be multiple of 90.")
 degrees = degrees % 360
-self._check_transform_limits(
+self._check_transform_limits()
-images_service_pb.ImagesServiceTransform.ROTATE)
 transform = images_service_pb.Transform()
 transform.set_rotate(degrees)
 self._transforms.append(transform)
 def horizontal_flip(self):
 """Flip the image horizontally.
 Raises:
-BadRequestError if a HorizontalFlip has already been requested on the
+BadRequestError if MAX_TRANSFORMS_PER_REQUEST transforms have already been
-image.
+requested on the image.
 """
-self._check_transform_limits(
+self._check_transform_limits()
-images_service_pb.ImagesServiceTransform.HORIZONTAL_FLIP)
 transform = images_service_pb.Transform()
 transform.set_horizontal_flip(True)
 self._transforms.append(transform)
 def vertical_flip(self):
 """Flip the image vertically.
 Raises:
-BadRequestError if a HorizontalFlip has already been requested on the
+BadRequestError if MAX_TRANSFORMS_PER_REQUEST transforms have already been
-image.
+requested on the image.
 """
-self._check_transform_limits(
+self._check_transform_limits()
-images_service_pb.ImagesServiceTransform.VERTICAL_FLIP)
 transform = images_service_pb.Transform()
 transform.set_vertical_flip(True)
 self._transforms.append(transform)
 bottom_y: float value between 0.0 and 1.0 (inclusive).
 Raises:
 TypeError if the args are not of type 'float'.
 BadRequestError when there is something wrong with the given bounding box
-or if there has already been a crop transform requested for this image.
+or if MAX_TRANSFORMS_PER_REQUEST transforms have already been requested
+for this image.
 """
 self._validate_crop_arg(left_x, "left_x")
 self._validate_crop_arg(top_y, "top_y")
 self._validate_crop_arg(right_x, "right_x")
 self._validate_crop_arg(bottom_y, "bottom_y")
 if left_x >= right_x:
 raise BadRequestError("left_x must be less than right_x")
 if top_y >= bottom_y:
 raise BadRequestError("top_y must be less than bottom_y")
-self._check_transform_limits(images_service_pb.ImagesServiceTransform.CROP)
+self._check_transform_limits()
 transform = images_service_pb.Transform()
 transform.set_crop_left_x(left_x)
 transform.set_crop_top_y(top_y)
 transform.set_crop_right_x(right_x)
 """Automatically adjust image contrast and color levels.
 This is similar to the "I'm Feeling Lucky" button in Picasa.
 Raises:
-BadRequestError if this transform has already been requested for this
+BadRequestError if MAX_TRANSFORMS_PER_REQUEST transforms have already
-image.
+been requested for this image.
 """
-self._check_transform_limits(
+self._check_transform_limits()
-images_service_pb.ImagesServiceTransform.IM_FEELING_LUCKY)
 transform = images_service_pb.Transform()
 transform.set_autolevels(True)
 self._transforms.append(transform)
 else:
 raise Error()
 self._image_data = response.image().content()
 self._transforms = []
-self._transform_map.clear()
 self._width = None
 self._height = None
 return self._image_data
 @property
 output_encoding: a value from OUTPUT_ENCODING_TYPES.
 Raises:
 TypeError when width or height not either 'int' or 'long' types.
 BadRequestError when there is something wrong with the given height or
-width or if a Resize has already been requested on this image.
+width.
 Error when something went wrong with the call.  See Image.ExecuteTransforms
 for more details.
 """
 image = Image(image_data)
 image.resize(width, height)
 degrees: value from ROTATE_DEGREE_VALUES.
 output_encoding: a value from OUTPUT_ENCODING_TYPES.
 Raises:
 TypeError when degrees is not either 'int' or 'long' types.
-BadRequestError when there is something wrong with the given degrees or
+BadRequestError when there is something wrong with the given degrees.
-if a Rotate trasnform has already been requested.
 Error when something went wrong with the call.  See Image.ExecuteTransforms
 for more details.
 """
 image = Image(image_data)
 image.rotate(degrees)
 bottom_y: float value between 0.0 and 1.0 (inclusive).
 output_encoding: a value from OUTPUT_ENCODING_TYPES.
 Raises:
 TypeError if the args are not of type 'float'.
-BadRequestError when there is something wrong with the given bounding box
+BadRequestError when there is something wrong with the given bounding box.
-or if there has already been a crop transform requested for this image.
 Error when something went wrong with the call.  See Image.ExecuteTransforms
 for more details.
 """
 image = Image(image_data)
 image.crop(left_x, top_y, right_x, bottom_y)

changeset 1278	a7766286a7be
parent 828	f5fd65cc3bf3
child 2273	e4cb9c53db3e