old_contents: #!/usr/bin/env python
  from codecs import open
  import os.path
  
  from setuptools import find_packages, setup
  
  here = os.path.abspath(os.path.dirname(__file__))
  
  
  def get_version():
      with open('stix2/version.py', encoding="utf-8") as f:
          for line in f.readlines():
              if line.startswith("__version__"):
                  version = line.split()[-1].strip('"')
                  return version
          raise AttributeError("Package does not have a __version__")
  
  
  with open(os.path.join(here, 'README.rst'), encoding='utf-8') as f:
      long_description = f.read()
  
  
  setup(
      name='stix2',
      version=get_version(),
      description='Produce and consume STIX 2 JSON content',
      long_description=long_description,
      url='https://github.com/oasis-open/cti-python-stix2',
      author='OASIS Cyber Threat Intelligence Technical Committee',
      author_email='cti-users@lists.oasis-open.org',
      maintainer='Greg Back',
      maintainer_email='gback@mitre.org',
      license='BSD',
      classifiers=[
          'Development Status :: 4 - Beta',
          'Intended Audience :: Developers',
          'Topic :: Security',
          'License :: OSI Approved :: BSD License',
          'Programming Language :: Python :: 2',
          'Programming Language :: Python :: 2.7',
          'Programming Language :: Python :: 3',
          'Programming Language :: Python :: 3.4',
          'Programming Language :: Python :: 3.5',
          'Programming Language :: Python :: 3.6',
      ],
      keywords="stix stix2 json cti cyber threat intelligence",
      packages=find_packages(exclude=['*.test']),
      install_requires=[
          'python-dateutil',
          'pytz',
          'requests',
          'simplejson',
          'six',
          'stix2-patterns',
          'taxii2-client',
      ],
      exclude_package_data={
          'test': ['stix2_data']
      },
  )
  
new_contents: #!/usr/bin/env python
  from codecs import open
  import os.path
  
  from setuptools import find_packages, setup
  
  here = os.path.abspath(os.path.dirname(__file__))
  
  
  def get_version():
      with open('stix2/version.py', encoding="utf-8") as f:
          for line in f.readlines():
              if line.startswith("__version__"):
                  version = line.split()[-1].strip('"')
                  return version
          raise AttributeError("Package does not have a __version__")
  
  
  with open(os.path.join(here, 'README.rst'), encoding='utf-8') as f:
      long_description = f.read()
  
  
  setup(
      name='stix2',
      version=get_version(),
      description='Produce and consume STIX 2 JSON content',
      long_description=long_description,
      url='https://github.com/oasis-open/cti-python-stix2',
      author='OASIS Cyber Threat Intelligence Technical Committee',
      author_email='cti-users@lists.oasis-open.org',
      maintainer='Greg Back',
      maintainer_email='gback@mitre.org',
      license='BSD',
      classifiers=[
          'Development Status :: 4 - Beta',
          'Intended Audience :: Developers',
          'Topic :: Security',
          'License :: OSI Approved :: BSD License',
          'Programming Language :: Python :: 2',
          'Programming Language :: Python :: 2.7',
          'Programming Language :: Python :: 3',
          'Programming Language :: Python :: 3.4',
          'Programming Language :: Python :: 3.5',
          'Programming Language :: Python :: 3.6',
      ],
      keywords="stix stix2 json cti cyber threat intelligence",
      packages=find_packages(exclude=['*.test']),
      install_requires=[
          'python-dateutil',
          'pytz',
          'requests',
          'simplejson',
          'six',
          'stix2-patterns',
          'taxii2-client',
      ],
  )
  
subject: Undo last commit