Merge pull request #38 from ahharu/to_merge

[Urgent] Fixed Branch perms and Client Delete

stashy/client.py

@@ -93,4 +93,4 @@ def delete(self, resource, data=None,**kw):
             kw = add_json_headers(kw)
             return self._session.request(method='DELETE', url=self.url(
                 resource), data=data, **kw)
-        return self._session.delete(self.url(resource),data, **kw)
+        return self._session.delete(self.url(resource), **kw)

stashy/helpers.py

@@ -21,6 +21,8 @@ def __init__(self, url, client, parent, api_path=None,
         if api_path is None:
             api_path = self._client.core_api_path
             branches_api_path = self._client.branches_api_path
+        if branches_api_path is None:
+            branches_api_path = self._client.branches_api_path
 
         # make sure we're only prefixing with one api path
         if url.startswith(api_path):
@@ -36,7 +38,9 @@ def __init__(self, url, client, parent, api_path=None,
             self._url = '{0}/{1}'.format(api_path, url)
             self._branchesurl = '{0}/{1}'.format(branches_api_path, url)
 
-
+
+
+
     def url(self, resource_url="", is_branches=False):
         if resource_url and not resource_url.startswith("/"):
             resource_url = "/" + resource_url