prompt: You will be provided with a partial code base and an issue statement explaining a problem to resolve.
  <issue>
  man page spelling error
  intances should be instances.
  
  It would be nice if this wasn't gz compressed in the source, otherwise I'd have done a pull request.
  
  </issue>
  <code>
  [start of setup.py]
  1 #! /usr/bin/env python
  2 
  3 """
  4 Distutils setup file for Scapy.
  5 """
  6 
  7 
  8 from distutils import archive_util
  9 from distutils import sysconfig
  10 from distutils.core import setup
  11 from distutils.command.sdist import sdist
  12 import os
  13 
  14 
  15 EZIP_HEADER = """#! /bin/sh
  16 PYTHONPATH=$0/%s exec python -m scapy
  17 """
  18 
  19 
  20 def make_ezipfile(base_name, base_dir, verbose=0, dry_run=0, **kwargs):
  21     fname = archive_util.make_zipfile(base_name, base_dir, verbose, dry_run)
  22     ofname = fname + ".old"
  23     os.rename(fname, ofname)
  24     of = open(ofname)
  25     f = open(fname, "w")
  26     f.write(EZIP_HEADER % base_dir)
  27     while True:
  28         data = of.read(8192)
  29         if not data:
  30             break
  31         f.write(data)
  32     f.close()
  33     os.system("zip -A '%s'" % fname)
  34     of.close()
  35     os.unlink(ofname)
  36     os.chmod(fname, 0o755)
  37     return fname
  38 
  39 
  40 archive_util.ARCHIVE_FORMATS["ezip"] = (
  41     make_ezipfile, [], 'Executable ZIP file')
  42 
  43 SCRIPTS = ['bin/scapy', 'bin/UTscapy']
  44 # On Windows we also need additional batch files to run the above scripts
  45 if os.name == "nt":
  46     SCRIPTS += ['bin/scapy.bat', 'bin/UTscapy.bat']
  47 
  48 setup(
  49     name='scapy',
  50     version=__import__('scapy').VERSION,
  51     packages=[
  52         'scapy',
  53         'scapy/arch',
  54         'scapy/arch/bpf',
  55         'scapy/arch/windows',
  56         'scapy/contrib',
  57         'scapy/layers',
  58         'scapy/layers/tls',
  59         'scapy/layers/tls/crypto',
  60         'scapy/modules',
  61         'scapy/modules/krack',
  62         'scapy/asn1',
  63         'scapy/tools',
  64     ],
  65     scripts=SCRIPTS,
  66     data_files=[('share/man/man1', ["doc/scapy.1.gz"])],
  67     package_data={
  68         'scapy': ['VERSION'],
  69     },
  70 
  71     # Metadata
  72     author='Philippe BIONDI',
  73     author_email='phil(at)secdev.org',
  74     maintainer='Pierre LALET, Guillaume VALADON',
  75     description='Scapy: interactive packet manipulation tool',
  76     license='GPLv2',
  77     url='http://www.secdev.org/projects/scapy',
  78     download_url='https://github.com/secdev/scapy/tarball/master',
  79     keywords=["network"],
  80     classifiers=[
  81         "Development Status :: 5 - Production/Stable",
  82         "Environment :: Console",
  83         "Intended Audience :: Developers",
  84         "Intended Audience :: Information Technology",
  85         "Intended Audience :: Science/Research",
  86         "Intended Audience :: System Administrators",
  87         "Intended Audience :: Telecommunications Industry",
  88         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
  89         "Programming Language :: Python :: 2",
  90         "Programming Language :: Python :: 2.7",
  91         "Programming Language :: Python :: 3",
  92         "Programming Language :: Python :: 3.4",
  93         "Programming Language :: Python :: 3.5",
  94         "Programming Language :: Python :: 3.6",
  95         "Topic :: Security",
  96         "Topic :: System :: Networking",
  97         "Topic :: System :: Networking :: Monitoring",
  98     ]
  99 )
  100
  [end of setup.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/setup.py b/setup.py
  --- a/setup.py
  +++ b/setup.py
  @@ -63,7 +63,7 @@
           'scapy/tools',
       ],
       scripts=SCRIPTS,
  -    data_files=[('share/man/man1', ["doc/scapy.1.gz"])],
  +    data_files=[('share/man/man1', ["doc/scapy.1"])],
       package_data={
           'scapy': ['VERSION'],
       },
  
verification_info: {"golden_diff": "diff --git a/setup.py b/setup.py\n--- a/setup.py\n+++ b/setup.py\n@@ -63,7 +63,7 @@\n         'scapy/tools',\n     ],\n     scripts=SCRIPTS,\n-    data_files=[('share/man/man1', [\"doc/scapy.1.gz\"])],\n+    data_files=[('share/man/man1', [\"doc/scapy.1\"])],\n     package_data={\n         'scapy': ['VERSION'],\n     },\n", "issue": "man page spelling error\nintances should be instances.\r\n\r\nIt would be nice if this wasn't gz compressed in the source, otherwise I'd have done a pull request.\n", "before_files": [{"content": "#! /usr/bin/env python\n\n\"\"\"\nDistutils setup file for Scapy.\n\"\"\"\n\n\nfrom distutils import archive_util\nfrom distutils import sysconfig\nfrom distutils.core import setup\nfrom distutils.command.sdist import sdist\nimport os\n\n\nEZIP_HEADER = \"\"\"#! /bin/sh\nPYTHONPATH=$0/%s exec python -m scapy\n\"\"\"\n\n\ndef make_ezipfile(base_name, base_dir, verbose=0, dry_run=0, **kwargs):\n    fname = archive_util.make_zipfile(base_name, base_dir, verbose, dry_run)\n    ofname = fname + \".old\"\n    os.rename(fname, ofname)\n    of = open(ofname)\n    f = open(fname, \"w\")\n    f.write(EZIP_HEADER % base_dir)\n    while True:\n        data = of.read(8192)\n        if not data:\n            break\n        f.write(data)\n    f.close()\n    os.system(\"zip -A '%s'\" % fname)\n    of.close()\n    os.unlink(ofname)\n    os.chmod(fname, 0o755)\n    return fname\n\n\narchive_util.ARCHIVE_FORMATS[\"ezip\"] = (\n    make_ezipfile, [], 'Executable ZIP file')\n\nSCRIPTS = ['bin/scapy', 'bin/UTscapy']\n# On Windows we also need additional batch files to run the above scripts\nif os.name == \"nt\":\n    SCRIPTS += ['bin/scapy.bat', 'bin/UTscapy.bat']\n\nsetup(\n    name='scapy',\n    version=__import__('scapy').VERSION,\n    packages=[\n        'scapy',\n        'scapy/arch',\n        'scapy/arch/bpf',\n        'scapy/arch/windows',\n        'scapy/contrib',\n        'scapy/layers',\n        'scapy/layers/tls',\n        'scapy/layers/tls/crypto',\n        'scapy/modules',\n        'scapy/modules/krack',\n        'scapy/asn1',\n        'scapy/tools',\n    ],\n    scripts=SCRIPTS,\n    data_files=[('share/man/man1', [\"doc/scapy.1.gz\"])],\n    package_data={\n        'scapy': ['VERSION'],\n    },\n\n    # Metadata\n    author='Philippe BIONDI',\n    author_email='phil(at)secdev.org',\n    maintainer='Pierre LALET, Guillaume VALADON',\n    description='Scapy: interactive packet manipulation tool',\n    license='GPLv2',\n    url='http://www.secdev.org/projects/scapy',\n    download_url='https://github.com/secdev/scapy/tarball/master',\n    keywords=[\"network\"],\n    classifiers=[\n        \"Development Status :: 5 - Production/Stable\",\n        \"Environment :: Console\",\n        \"Intended Audience :: Developers\",\n        \"Intended Audience :: Information Technology\",\n        \"Intended Audience :: Science/Research\",\n        \"Intended Audience :: System Administrators\",\n        \"Intended Audience :: Telecommunications Industry\",\n        \"License :: OSI Approved :: GNU General Public License v2 (GPLv2)\",\n        \"Programming Language :: Python :: 2\",\n        \"Programming Language :: Python :: 2.7\",\n        \"Programming Language :: Python :: 3\",\n        \"Programming Language :: Python :: 3.4\",\n        \"Programming Language :: Python :: 3.5\",\n        \"Programming Language :: Python :: 3.6\",\n        \"Topic :: Security\",\n        \"Topic :: System :: Networking\",\n        \"Topic :: System :: Networking :: Monitoring\",\n    ]\n)\n", "path": "setup.py"}]}