prompt: You will be provided with a partial code base and an issue statement explaining a problem to resolve.
  <issue>
  datapipeline query-object --query argument is shadowed
  The top level `--query` option shadows the `--query` from datapipeline query-object.  This can be addressed in the argrename customization model.  We can also take this opportunity to remove the `cli_name` from the `.extra.json` files in botocore.
  
  
  </issue>
  <code>
  [start of awscli/customizations/argrename.py]
  1 # Copyright 2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  2 #
  3 # Licensed under the Apache License, Version 2.0 (the "License"). You
  4 # may not use this file except in compliance with the License. A copy of
  5 # the License is located at
  6 #
  7 #     http://aws.amazon.com/apache2.0/
  8 #
  9 # or in the "license" file accompanying this file. This file is
  10 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
  11 # ANY KIND, either express or implied. See the License for the specific
  12 # language governing permissions and limitations under the License.
  13 """
  14 """
  15 
  16 from awscli.customizations import utils
  17 
  18 
  19 ARGUMENT_RENAMES = {
  20     # Mapping of original arg to renamed arg.
  21     # The key is <service>.<operation>.argname
  22     # The first part of the key is used for event registration
  23     # so if you wanted to rename something for an entire service you
  24     # could say 'ec2.*.dry-run': 'renamed-arg-name', or if you wanted
  25     # to rename across all services you could say '*.*.dry-run': 'new-name'.
  26     'ec2.create-image.no-no-reboot': 'reboot',
  27     'ec2.*.no-egress': 'ingress',
  28     'ec2.*.no-disable-api-termination': 'enable-api-termination',
  29 }
  30 
  31 
  32 def register_arg_renames(cli):
  33     for original, new_name in ARGUMENT_RENAMES.items():
  34         event_portion, original_arg_name = original.rsplit('.', 1)
  35         cli.register('building-argument-table.%s' % event_portion,
  36                      rename_arg(original_arg_name, new_name))
  37 
  38 
  39 def rename_arg(original_arg_name, new_name):
  40     def _rename_arg(argument_table, **kwargs):
  41         if original_arg_name in argument_table:
  42             utils.rename_argument(argument_table, original_arg_name, new_name)
  43     return _rename_arg
  44
  [end of awscli/customizations/argrename.py]
  </code>
  
  I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
  <patch>
  diff --git a/file.py b/file.py
  --- a/file.py
  +++ b/file.py
  @@ -1,27 +1,35 @@
   def euclidean(a, b):
  -    while b:
  -        a, b = b, a % b
  -    return a
  +    if b == 0:
  +        return a
  +    return euclidean(b, a % b)
   
   
   def bresenham(x0, y0, x1, y1):
       points = []
       dx = abs(x1 - x0)
       dy = abs(y1 - y0)
  -    sx = 1 if x0 < x1 else -1
  -    sy = 1 if y0 < y1 else -1
  -    err = dx - dy
  +    x, y = x0, y0
  +    sx = -1 if x0 > x1 else 1
  +    sy = -1 if y0 > y1 else 1
   
  -    while True:
  -        points.append((x0, y0))
  -        if x0 == x1 and y0 == y1:
  -            break
  -        e2 = 2 * err
  -        if e2 > -dy:
  -            err -= dy
  -            x0 += sx
  -        if e2 < dx:
  -            err += dx
  -            y0 += sy
  +    if dx > dy:
  +        err = dx / 2.0
  +        while x != x1:
  +            points.append((x, y))
  +            err -= dy
  +            if err < 0:
  +                y += sy
  +                err += dx
  +            x += sx
  +    else:
  +        err = dy / 2.0
  +        while y != y1:
  +            points.append((x, y))
  +            err -= dx
  +            if err < 0:
  +                x += sx
  +                err += dy
  +            y += sy
  +
  +    points.append((x, y))
       return points
  
  </patch>
golden_diff: diff --git a/awscli/customizations/argrename.py b/awscli/customizations/argrename.py
  --- a/awscli/customizations/argrename.py
  +++ b/awscli/customizations/argrename.py
  @@ -26,6 +26,11 @@
       'ec2.create-image.no-no-reboot': 'reboot',
       'ec2.*.no-egress': 'ingress',
       'ec2.*.no-disable-api-termination': 'enable-api-termination',
  +    'opsworks.*.region': 'stack-region',
  +    'elastictranscoder.*.output': 'job-output',
  +    'swf.register-activity-type.version': 'activity-version',
  +    'swf.register-workflow-type.version': 'workflow-version',
  +    'datapipeline.*.query': 'objects-query',
   }
  
verification_info: {"golden_diff": "diff --git a/awscli/customizations/argrename.py b/awscli/customizations/argrename.py\n--- a/awscli/customizations/argrename.py\n+++ b/awscli/customizations/argrename.py\n@@ -26,6 +26,11 @@\n     'ec2.create-image.no-no-reboot': 'reboot',\n     'ec2.*.no-egress': 'ingress',\n     'ec2.*.no-disable-api-termination': 'enable-api-termination',\n+    'opsworks.*.region': 'stack-region',\n+    'elastictranscoder.*.output': 'job-output',\n+    'swf.register-activity-type.version': 'activity-version',\n+    'swf.register-workflow-type.version': 'workflow-version',\n+    'datapipeline.*.query': 'objects-query',\n }\n", "issue": "datapipeline query-object --query argument is shadowed\nThe top level `--query` option shadows the `--query` from datapipeline query-object.  This can be addressed in the argrename customization model.  We can also take this opportunity to remove the `cli_name` from the `.extra.json` files in botocore.\n\n", "before_files": [{"content": "# Copyright 2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\"). You\n# may not use this file except in compliance with the License. A copy of\n# the License is located at\n#\n#     http://aws.amazon.com/apache2.0/\n#\n# or in the \"license\" file accompanying this file. This file is\n# distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF\n# ANY KIND, either express or implied. See the License for the specific\n# language governing permissions and limitations under the License.\n\"\"\"\n\"\"\"\n\nfrom awscli.customizations import utils\n\n\nARGUMENT_RENAMES = {\n    # Mapping of original arg to renamed arg.\n    # The key is <service>.<operation>.argname\n    # The first part of the key is used for event registration\n    # so if you wanted to rename something for an entire service you\n    # could say 'ec2.*.dry-run': 'renamed-arg-name', or if you wanted\n    # to rename across all services you could say '*.*.dry-run': 'new-name'.\n    'ec2.create-image.no-no-reboot': 'reboot',\n    'ec2.*.no-egress': 'ingress',\n    'ec2.*.no-disable-api-termination': 'enable-api-termination',\n}\n\n\ndef register_arg_renames(cli):\n    for original, new_name in ARGUMENT_RENAMES.items():\n        event_portion, original_arg_name = original.rsplit('.', 1)\n        cli.register('building-argument-table.%s' % event_portion,\n                     rename_arg(original_arg_name, new_name))\n\n\ndef rename_arg(original_arg_name, new_name):\n    def _rename_arg(argument_table, **kwargs):\n        if original_arg_name in argument_table:\n            utils.rename_argument(argument_table, original_arg_name, new_name)\n    return _rename_arg\n", "path": "awscli/customizations/argrename.py"}]}