PYAPI-31 Common: Code Cleanup

Author: astromatt

atlassian/__init__.py

@@ -12,7 +12,7 @@ def __init__(self, url, username, password):
         self.username = username
         self.password = password
 
-    def log_curl_debug(self, method, path, headers={}, data=None, level=logging.DEBUG):
+    def log_curl_debug(self, method, path, data=None, headers={}, level=logging.DEBUG):
         message = "curl --silent -X {method} -u '{username}':'{password}' -H {headers} {data} '{url}'".format(
             method=method,
             username=self.username,
@@ -22,9 +22,9 @@ def log_curl_debug(self, method, path, headers={}, data=None, level=logging.DEBU
             url='{0}{1}'.format(self.url, path))
         log.log(level=level, msg=message)
 
-    def request(self, method='GET', path='/',
-                headers={'Content-Type': 'application/json', 'Accept': 'application/json'}, data=None):
-        self.log_curl_debug(method, path, headers, data)
+    def request(self, method='GET', path='/', data=None,
+                headers={'Content-Type': 'application/json', 'Accept': 'application/json'}):
+        self.log_curl_debug(method=method, path=path, headers=headers, data=data)
         response = requests.request(
             method=method,
             url='{0}{1}'.format(self.url, path),
@@ -33,24 +33,24 @@ def request(self, method='GET', path='/',
             auth=(self.username, self.password),
             timeout=60)
         if response.status_code != 200:
-            self.log_curl_debug(method, path, headers, data, level=logging.WARNING)
+            self.log_curl_debug(method=method, path=path, headers=headers, data=data, level=logging.WARNING)
             log.warning(response.json())
             response.raise_for_status()
         else:
             log.debug('Received: {0}'.format(response.json()))
         return response
 
-    def get(self, path, headers={'Content-Type': 'application/json', 'Accept': 'application/json'}):
-        return self.request('GET', path, headers).json()
+    def get(self, path, data=None, headers={'Content-Type': 'application/json', 'Accept': 'application/json'}):
+        return self.request('GET', path=path, data=data, headers=headers).json()
 
-    def post(self, path, headers={'Content-Type': 'application/json', 'Accept': 'application/json'}, data=None):
-        return self.request('POST', path, headers, data).json()
+    def post(self, path, data=None, headers={'Content-Type': 'application/json', 'Accept': 'application/json'}):
+        return self.request('POST', path=path, data=data, headers=headers).json()
 
-    def put(self, path, headers={'Content-Type': 'application/json', 'Accept': 'application/json'}, data=None):
-        return self.request('PUT', path, headers, data).json()
+    def put(self, path, data=None, headers={'Content-Type': 'application/json', 'Accept': 'application/json'}):
+        return self.request('PUT', path=path, data=data, headers=headers).json()
 
-    def delete(self, path, headers={'Content-Type': 'application/json', 'Accept': 'application/json'}):
-        return self.request('DELETE', path, headers).json()
+    def delete(self, path, data=None, headers={'Content-Type': 'application/json', 'Accept': 'application/json'}):
+        return self.request('DELETE', path=path, data=data, headers=headers).json()
 
 
 from .confluence import Confluence

atlassian/portfolio.py

@@ -83,10 +83,10 @@ def get_estimates_dict(self, estimates):
 
     def import_workitem(self, data):
         url = '/rest/roadmap/1.0/plans/bulk/{0}/workitems.json'.format(self.plan_id)
-        return self.post(url, data)
+        return self.post(url, data=data)
 
-    def get_jql_issues(self, jql, limit=500, exclude_linked=True, estimation_method='estimates', epic_fetch_enabled=True,
-                      load_story_points=True):
+    def get_jql_issues(self, jql, limit=500, exclude_linked=True, estimation_method='estimates',
+                       epic_fetch_enabled=True, load_story_points=True):
         url = '/rest/roadmap/1.0/system/import.json'
         data = {'planId': str(self.plan_id),
                 'query': jql,
@@ -95,4 +95,4 @@ def get_jql_issues(self, jql, limit=500, exclude_linked=True, estimation_method=
                 'maxResults': limit,
                 'estimationMethod': estimation_method,
                 'loadStoryPoints': load_story_points}
-        self.post(url, data=data)
+        return self.post(url, data=data)['data']['items']

setup.py

@@ -1,4 +1,5 @@
 import sys
+from setuptools import find_packages
 from setuptools import setup
 
 
@@ -9,15 +10,15 @@
     description='Python Atlassian REST API Wrapper',
     long_description='Python Atlassian REST API Wrapper',
     license='Apache License 2.0',
-    version='0.9.0',
+    version='0.9.1',
     download_url='https://github.com/MattAgile/atlassian-python-api',
 
     author='Matt Harasymczuk',
     author_email='code@mattagile.com',
     url='http://mattagile.com/',
 
-    packages=['atlassian'],
-    package_data={'': ['LICENSE', 'README'], 'atlassian': ['*.py']},
+    packages=find_packages(),
+    package_data={'': ['LICENSE', 'README.rst'], 'atlassian': ['*.py']},
     package_dir={'atlassian': 'atlassian'},
     include_package_data=True,
 
@@ -47,7 +48,6 @@
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
         'Topic :: Software Development :: Libraries :: Python Modules',
-        'Topic :: Software Development :: Libraries :: Application Frameworks',
-    ],
+        'Topic :: Software Development :: Libraries :: Application Frameworks']
 )