Skip to content

CLN: Using clearer imports #32459

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

Merged
merged 2 commits into from
Mar 19, 2020
Merged

CLN: Using clearer imports #32459

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87b13ae
CLN: Using clearer imports
Mar 5, 2020
8d7f0e1
Merge remote-tracking branch 'upstream/master' into CLN-unclear-import
Mar 6, 2020
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
22 changes: 11 additions & 11 deletions pandas/_libs/tslibs/strptime.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import time
import locale
import calendar
import re
from datetime import date as datetime_date
import datetime

from _thread import allocate_lock as _thread_allocate_lock

Expand Down Expand Up @@ -288,20 +288,20 @@ def array_strptime(object[:] values, object fmt, bint exact=True, errors='raise'
elif iso_year != -1 and iso_week != -1:
year, julian = _calc_julian_from_V(iso_year, iso_week,
weekday + 1)
# Cannot pre-calculate datetime_date() since can change in Julian
# Cannot pre-calculate datetime.date() since can change in Julian
# calculation and thus could have different value for the day of the wk
# calculation.
try:
if julian == -1:
# Need to add 1 to result since first day of the year is 1, not
# 0.
ordinal = datetime_date(year, month, day).toordinal()
julian = ordinal - datetime_date(year, 1, 1).toordinal() + 1
ordinal = datetime.date(year, month, day).toordinal()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is going to involve an extra python-space lookup, need to check perf

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the test case I have used for both of the tests:

import numpy as np

import pandas._libs.tslibs.strptime as strptime

f = "%Y-%m-%d %H:%M:%S %Z"

arr = ['2010-01-01 12:00:00 UTC +0100'] * 100

strptime.array_strptime(np.array(arr, dtype="object"), f, exact=False)

master:

In [5]: %timeit strptime.array_strptime(np.array(arr, dtype="object"), f, exact=False)
1.19 ms ± 15.6 µs per loop (mean ± std. dev. of 7 runs, 1000 loops each)

PR:

In [5]: %timeit strptime.array_strptime(np.array(arr, dtype="object"), f, exact=False)
1.2 ms ± 13.5 µs per loop (mean ± std. dev. of 7 runs, 1000 loops each)

julian = ordinal - datetime.date(year, 1, 1).toordinal() + 1
else:
# Assume that if they bothered to include Julian day it will
# be accurate.
datetime_result = datetime_date.fromordinal(
(julian - 1) + datetime_date(year, 1, 1).toordinal())
datetime_result = datetime.date.fromordinal(
(julian - 1) + datetime.date(year, 1, 1).toordinal())
year = datetime_result.year
month = datetime_result.month
day = datetime_result.day
Expand All @@ -311,7 +311,7 @@ def array_strptime(object[:] values, object fmt, bint exact=True, errors='raise'
continue
raise
if weekday == -1:
weekday = datetime_date(year, month, day).weekday()
weekday = datetime.date(year, month, day).weekday()

dts.year = year
dts.month = month
Expand Down Expand Up @@ -649,7 +649,7 @@ cdef int _calc_julian_from_U_or_W(int year, int week_of_year,
cdef:
int first_weekday, week_0_length, days_to_week

first_weekday = datetime_date(year, 1, 1).weekday()
first_weekday = datetime.date(year, 1, 1).weekday()
# If we are dealing with the %U directive (week starts on Sunday), it's
# easier to just shift the view to Sunday being the first day of the
# week.
Expand Down Expand Up @@ -692,14 +692,14 @@ cdef (int, int) _calc_julian_from_V(int iso_year, int iso_week, int iso_weekday)
cdef:
int correction, ordinal

correction = datetime_date(iso_year, 1, 4).isoweekday() + 3
correction = datetime.date(iso_year, 1, 4).isoweekday() + 3
ordinal = (iso_week * 7) + iso_weekday - correction
# ordinal may be negative or 0 now, which means the date is in the previous
# calendar year
if ordinal < 1:
ordinal += datetime_date(iso_year, 1, 1).toordinal()
ordinal += datetime.date(iso_year, 1, 1).toordinal()
iso_year -= 1
ordinal -= datetime_date(iso_year, 1, 1).toordinal()
ordinal -= datetime.date(iso_year, 1, 1).toordinal()
return iso_year, ordinal


Expand Down