Skip to content
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

Jump to bottom

Fixed file objects with hyphen issue (ucfopen#647 ) and added test cases #650

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

Fixed file objects with hyphen issue (ucfopen#647 ) and added test cases #650

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0383237
fixed issue 647 and added test cases
nayanpaa Apr 23, 2024
b087966
changed to keep both attributes and added corresponding tests
nayanpaa Apr 24, 2024
ae6c387
now following correct style implementations for issue #647
nayanpaa Apr 24, 2024
5c02d7e
Fix isort
Thetwam Apr 29, 2024
51e59d1
Add failing test to demonstrate issue with content_type conversion
Thetwam Apr 29, 2024
66680c6
Add failing test to check for DeprecationWarning when accessing conte…
Thetwam Apr 29, 2024
583e9c3
Moved content-type attribute deprecation warning to getter
Thetwam Apr 29, 2024
fd067da
Merge branch 'develop' into issue/647-File-objects-get-attribute-cont…
Thetwam May 11, 2024
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
5 changes: 3 additions & 2 deletions canvasapi/canvas_object.py
View file
Open in desktop
bennettscience marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,13 @@ def set_attributes(self, attributes):
:type attributes: dict
"""
for attribute, value in attributes.items():
self.__setattr__(attribute, value)
safe_attribute = attribute.replace("-", "_")
self.__setattr__(safe_attribute, value)

try:
naive = arrow.get(str(value)).datetime
aware = naive.replace(tzinfo=pytz.utc) - naive.utcoffset()
self.__setattr__(attribute + "_date", aware)
self.__setattr__(safe_attribute + "_date", aware)
except arrow.ParserError:
pass
except ValueError:
Expand Down
27 changes: 27 additions & 0 deletions tests/test_canvas_object.py
View file
Open in desktop
bennettscience marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,33 @@ def test_set_attributes_valid_date(self, m):

self.assertTrue(hasattr(self.canvas_object, "half_offset_date"))
self.assertEqual(self.canvas_object.half_offset_date, offset_time)

# set_attributes with a hyphen
def test_set_attributes_with_hyphens(self, m):
attributes = {
"content-type": "application/json",
"filename": "example.json",
"start-at": "2012-05-05T00:00:00Z",
"end-at": "2012-08-05",
}

start_date = datetime.strptime(
attributes["start-at"], "%Y-%m-%dT%H:%M:%SZ"
).replace(tzinfo=pytz.utc)
end_date = datetime.strptime(attributes["end-at"], "%Y-%m-%d").replace(
tzinfo=pytz.utc
)

self.canvas_object.set_attributes(attributes)

self.assertTrue(hasattr(self.canvas_object, "start_at_date"))
self.assertEqual(self.canvas_object.start_at_date, start_date)
self.assertTrue(hasattr(self.canvas_object, "end_at_date"))
self.assertEqual(self.canvas_object.end_at_date, end_date)
self.assertTrue(hasattr(self.canvas_object, "content_type"))
self.assertEqual(self.canvas_object.content_type, "application/json")
self.assertTrue(hasattr(self.canvas_object, "filename"))
self.assertEqual(self.canvas_object.filename, "example.json")

def test_set_attributes_invalid_date(self, m):
attributes = {"start_at": "2017-01-01T00:00+00:00:00", "end_at": "2012-08-0"}
Expand Down