Skip to content

remove url encoding, rely on default encoding from tools as needed #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sblack-usu wants to merge 1 commit into from
Closed

remove url encoding, rely on default encoding from tools as needed #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions hsclient/hydroshare.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

from hsclient.json_models import ResourcePreview, User
from hsclient.oauth2_model import Token
from hsclient.utils import attribute_filter, encode_resource_url, is_aggregation, main_file_type
from hsclient.utils import attribute_filter, is_aggregation, main_file_type

import pkg_resources # part of setuptools
VERSION = pkg_resources.get_distribution(__package__).version
Expand Down Expand Up @@ -1429,7 +1429,7 @@ def upload_file(self, path, files, status_code=204):
return self.post(path, files=files, status_code=status_code)

def post(self, path, status_code, data=None, params={}, **kwargs):
url = encode_resource_url(self._build_url(path))
url = self._build_url(path)
response = self._session.post(url, params=params, data=data, **kwargs)
if response.status_code != status_code:
raise Exception(
Expand All @@ -1438,7 +1438,7 @@ def post(self, path, status_code, data=None, params={}, **kwargs):
return response

def put(self, path, status_code, data=None, **kwargs):
url = encode_resource_url(self._build_url(path))
url = self._build_url(path)
response = self._session.put(url, data=data, **kwargs)
if response.status_code != status_code:
raise Exception(
Expand All @@ -1447,7 +1447,7 @@ def put(self, path, status_code, data=None, **kwargs):
return response

def get(self, path, status_code, **kwargs):
url = encode_resource_url(self._build_url(path))
url = self._build_url(path)
response = self._session.get(url, **kwargs)
if response.status_code != status_code:
raise Exception(
Expand All @@ -1456,7 +1456,7 @@ def get(self, path, status_code, **kwargs):
return response

def delete(self, path, status_code, **kwargs):
url = encode_resource_url(self._build_url(path))
url = self._build_url(path)
response = self._session.delete(url, **kwargs)
if response.status_code != status_code:
raise Exception(
Expand Down
14 changes: 0 additions & 14 deletions hsclient/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,6 @@ def attribute_filter(o, key, value) -> bool:
return attr == value


def encode_resource_url(url):
"""
URL encodes a full resource file/folder url.
:param url: a string url
:return: url encoded string
"""
import urllib

parsed_url = urllib.parse.urlparse(url)
url_encoded_path = pathname2url(parsed_url.path)
encoded_url = parsed_url._replace(path=url_encoded_path).geturl()
return encoded_url


def is_folder(path):
"""Checks for an extension to determine if the path is to a folder"""
return splitext(path)[1] == ''