Package changes

zaproxy · May 5, 2017 · be825cb · be825cb
1 parent 587e7d2
commit be825cb
Show file tree

Hide file tree

Showing 28 changed files with 16 additions and 54 deletions.
diff --git a/example.py b/example.py
diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 
 
 try:
-    from setuptools import setup
+    from setuptools import setup, find_packages
 except ImportError:
     raise SystemExit(1)
 
@@ -23,17 +23,20 @@
     'requests_mock'
 )
 setup(
-    name="python-owasp-zap",
-    version="2.5",
-    description="OWASP ZAP API library",
-    long_description="OWASP Zed Attack Proxy 2.5 API python library",
+    name="python-owasp-zap-v2.4",
+    version="0.0.10",
+    description="OWASP ZAP 2.6 API client",
+    long_description="OWASP Zed Attack Proxy 2.6 API python client (the 2.4 package name has been kept to make it easier to upgrade)",
     author="ZAP development team",
     author_email='',
     url="https://www.owasp.org/index.php/OWASP_Zed_Attack_Proxy_Project",
-    download_url="https://github.com/zaproxy/zap-api-python/releases/tag/2.5",
+    download_url="https://github.com/zaproxy/zap-api-python/releases/tag/0.0.10",
     platforms=['any'],
     license="ASL2.0",
-    packages=['zap'],
+    package_dir={
+        '': 'src',
+    },
+    packages=find_packages('src'),
     classifiers=[
         'License :: OSI Approved :: Apache Software License',
         'Development Status :: 5 - Production/Stable',

diff --git a/src/examples/basic-spider-scan.py b/src/examples/basic-spider-scan.py
@@ -3,15 +3,15 @@
 
 import time
 from pprint import pprint
-from zap import ZAP
+from zapv2 import ZAPv2
 
 target = 'http://127.0.0.1'
 apikey = 'changeme' # Change to match the API key set in ZAP, or use None if the API key is disabled
 #
 # By default ZAP API client will connect to port 8080
-zap = ZAP(apikey=apikey)
+zap = ZAPv2(apikey=apikey)
 # Use the line below if ZAP is not listening on port 8080, for example, if listening on port 8090
-# zap = ZAP(apikey=apikey, proxies={'http': 'http://127.0.0.1:8090', 'https': 'http://127.0.0.1:8090'})
+# zap = ZAPv2(apikey=apikey, proxies={'http': 'http://127.0.0.1:8090', 'https': 'http://127.0.0.1:8090'})
 
 # Proxy a request to the target so that ZAP has something to deal with
 print('Accessing target {}'.format(target))

diff --git a/zap/__init__.py → src/zapv2/__init__.py b/zap/__init__.py → src/zapv2/__init__.py
@@ -50,7 +50,7 @@
 from .users import users
 
 
-class ZAP(object):
+class ZAPv2(object):
     """
     Client API implementation for integrating with ZAP v2.
     """

diff --git a/zap/acsrf.py → src/zapv2/acsrf.py b/zap/acsrf.py → src/zapv2/acsrf.py
diff --git a/zap/ajaxSpider.py → src/zapv2/ajaxSpider.py b/zap/ajaxSpider.py → src/zapv2/ajaxSpider.py
diff --git a/zap/ascan.py → src/zapv2/ascan.py b/zap/ascan.py → src/zapv2/ascan.py
diff --git a/zap/authentication.py → src/zapv2/authentication.py b/zap/authentication.py → src/zapv2/authentication.py
diff --git a/zap/authorization.py → src/zapv2/authorization.py b/zap/authorization.py → src/zapv2/authorization.py
diff --git a/zap/autoupdate.py → src/zapv2/autoupdate.py b/zap/autoupdate.py → src/zapv2/autoupdate.py
diff --git a/zap/brk.py → src/zapv2/brk.py b/zap/brk.py → src/zapv2/brk.py
diff --git a/zap/context.py → src/zapv2/context.py b/zap/context.py → src/zapv2/context.py
diff --git a/zap/core.py → src/zapv2/core.py b/zap/core.py → src/zapv2/core.py
diff --git a/zap/forcedUser.py → src/zapv2/forcedUser.py b/zap/forcedUser.py → src/zapv2/forcedUser.py
diff --git a/zap/httpSessions.py → src/zapv2/httpSessions.py b/zap/httpSessions.py → src/zapv2/httpSessions.py
diff --git a/zap/importLogFiles.py → src/zapv2/importLogFiles.py b/zap/importLogFiles.py → src/zapv2/importLogFiles.py
diff --git a/zap/params.py → src/zapv2/params.py b/zap/params.py → src/zapv2/params.py
diff --git a/zap/pnh.py → src/zapv2/pnh.py b/zap/pnh.py → src/zapv2/pnh.py
diff --git a/zap/pscan.py → src/zapv2/pscan.py b/zap/pscan.py → src/zapv2/pscan.py
diff --git a/zap/reveal.py → src/zapv2/reveal.py b/zap/reveal.py → src/zapv2/reveal.py
diff --git a/zap/script.py → src/zapv2/script.py b/zap/script.py → src/zapv2/script.py
diff --git a/zap/search.py → src/zapv2/search.py b/zap/search.py → src/zapv2/search.py
diff --git a/zap/selenium.py → src/zapv2/selenium.py b/zap/selenium.py → src/zapv2/selenium.py
diff --git a/zap/sessionManagement.py → src/zapv2/sessionManagement.py b/zap/sessionManagement.py → src/zapv2/sessionManagement.py
diff --git a/zap/spider.py → src/zapv2/spider.py b/zap/spider.py → src/zapv2/spider.py
diff --git a/zap/stats.py → src/zapv2/stats.py b/zap/stats.py → src/zapv2/stats.py
diff --git a/zap/users.py → src/zapv2/users.py b/zap/users.py → src/zapv2/users.py
diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py
@@ -2,14 +2,14 @@
 
 import requests_mock
 
-from zap import ZAP
+from zapv2 import ZAPv2
 
 
 @pytest.yield_fixture
 def zap():
     """
     All tests will be able to share the instance of client with the same settings."""
-    yield ZAP(apikey='testapikey')
+    yield ZAPv2(apikey='testapikey')
 
 
 @pytest.yield_fixture(autouse=True)