Skip to content

Commit 42dabba

Browse files
committed
Fix date parsing with GitLab 6.4.3
1 parent 449e848 commit 42dabba

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

ChangeLog renamed to CHANGELOG

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
v0.5.2
2+
[*] Support converting timestamps that include microseconds
3+
14
v0.5.1
25
[*] Rename find_project_by_name to find_projects_by_name before hitting PyPI
36

@@ -12,7 +15,7 @@ v0.5.0
1215
[*] Added <group>.members()
1316
[*] Added <group>.add_member()
1417
[*] Added <group>.delete_member() and <group_member>.delete()
15-
[*] Default ssl_verify to 'True' for clarity
18+
[*] Default ssl_verify to 'True' for clarity
1619
[*] Bugfix: Correct merge requests API (this GitLab API is not standard)
1720

1821
v0.4.2

gitlab3/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,8 @@ def _convert_gitlab_date(self, datetime_str):
351351
else:
352352
offset = datetime_str[-6:]
353353
datetime_str = datetime_str[:-6]
354+
if re.search(r'\.[0-9]{3}$', datetime_str):
355+
fmt += '.%f' # microseconds are included
354356
dt = datetime.strptime(datetime_str, fmt)
355357
if not offset:
356358
return dt

0 commit comments

Comments
 (0)