Major version bump 2.0 (#3)

* Removed check for DisablePayloadHandler in msfrpc.

* Update for Py3

* Replace basestring -> str for Python 3

* Run 2to3 on scripts

* Remove backup files

* Update version to 2.0 everywhere. Bump copyright year to 2021.

* 2to3 metasploit directory

* Ignore contents recommended by GitHub for Python and JetBrains.

* Remove egg-info files

* Ignore any .bak backup files

* Add .idea, default workspace files only, sensitive configs excluded.

* Remove redundant README, leave .md version

* Remove redundant type cast

* Ignore JetBrains settings.

* Delete JetBrains settings.

* Update reference to README.md that would prevent install.

* Add installation info to readme.

Co-authored-by: 72616e646f6d <[email protected]>
Co-authored-by: Mike Rinehart <[email protected]>
Co-authored-by: allfro <[email protected]>

.gitignore

@@ -1,2 +1,146 @@
-.idea/
+# Source: https://github.com/github/gitignore/blob/master/Python.gitignore
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
 venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# JetBrains settings
+.idea/
+
+# Any file labeled as a backup
+*.bak

README.md

@@ -16,6 +16,12 @@ Before we begin, you'll need to install the following components:
 Installing PostgreSQL is highly recommended as it will improve response times when querying `msfrpcd` (Metasploit RPC
 daemon) for module information.
 
+# Installation
+
+To install pymetasploit, run `pip install git+https://github.com/rapid7/komand-pymetasploit.git`.
+
+The Rapid7 fork of pymetasploit is not yet available on PyPI.
+
 # Tutorial
 
 ## Starting `msfrpcd`

setup.py

@@ -9,7 +9,7 @@ def read(fname):
 setup(
     name='pymetasploit',
     author='Nadeem Douba',
-    version='1.1',
+    version='2.0',
     author_email='[email protected]',
     description='A full-fledged msfrpc library for Metasploit framework.',
     license='GPL',
@@ -24,5 +24,5 @@ def read(fname):
     ],
     url='https://github.com/allfro/pymetasploit',
     download_url='https://github.com/allfro/pymetasploit/zipball/master',
-    long_description=read('README')
+    long_description=read('README.md')
 )