Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 0c64cd5

Browse filesBrowse files
committed
Merge branch 'v2.0.x'
2 parents 6333526 + a6f881a commit 0c64cd5
Copy full SHA for 0c64cd5

File tree

Expand file treeCollapse file tree

2 files changed

+2
-1
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+2
-1
lines changed

‎lib/matplotlib/dates.py

Copy file name to clipboardExpand all lines: lib/matplotlib/dates.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ def _from_ordinalf(x, tz=None):
281281
elif dt.microsecond > 999990:
282282
dt += datetime.timedelta(microseconds=1e6 - dt.microsecond)
283283

284-
return dt
284+
return dt.astimezone(tz)
285285

286286

287287
# a version of _from_ordinalf that can operate on numpy arrays

‎lib/mpl_toolkits/tests/test_axes_grid1.py

Copy file name to clipboardExpand all lines: lib/mpl_toolkits/tests/test_axes_grid1.py
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ def test_twin_axes_empty_and_removed():
8282
horizontalalignment="center", verticalalignment="center")
8383
plt.subplots_adjust(wspace=0.5, hspace=1)
8484

85+
8586
if __name__ == '__main__':
8687
import nose
8788
nose.runmodule(argv=['-s', '--with-doctest'], exit=False)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.