Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
7e461a1
remove \n from docstring
charlesdong1991 Dec 3, 2018
1314059
fix conflicts
charlesdong1991 Jan 19, 2019
8bcb313
Merge remote-tracking branch 'upstream/master'
charlesdong1991 Jul 30, 2019
07c6003
Merge remote-tracking branch 'upstream/master' into fix_issue_28426
charlesdong1991 Sep 13, 2019
495f4ca
Remove error raising
charlesdong1991 Sep 13, 2019
65f3a34
better test case
charlesdong1991 Sep 13, 2019
b985055
Fix test for series
charlesdong1991 Sep 13, 2019
fb43351
Add whatsnew
charlesdong1991 Sep 13, 2019
2bc05c3
better english
charlesdong1991 Sep 13, 2019
39d3aee
more accurate explanation
charlesdong1991 Sep 13, 2019
df51bf9
Remove unused imports
charlesdong1991 Sep 13, 2019
d162b3e
code change based on review
charlesdong1991 Sep 14, 2019
31e8079
fix test
charlesdong1991 Sep 14, 2019
7e87435
code change and reformat
charlesdong1991 Sep 15, 2019
1361236
move whatsnew to 1.0.0
charlesdong1991 Sep 16, 2019
3815507
add test
charlesdong1991 Sep 17, 2019
8a9c41b
bold change
charlesdong1991 Sep 17, 2019
6eeb978
remove unused comment
charlesdong1991 Sep 17, 2019
2ae946e
remove print
charlesdong1991 Sep 18, 2019
2e5fd6e
revert blank line change
charlesdong1991 Sep 18, 2019
b10b4b8
revert previous change
charlesdong1991 Sep 22, 2019
314eb28
revert unnecessary white space removal
charlesdong1991 Sep 22, 2019
3fc2d71
fix conflicts and merge master
charlesdong1991 Oct 19, 2019
fd485d7
fix tests
charlesdong1991 Oct 19, 2019
5817f5e
fix test
charlesdong1991 Oct 19, 2019
84f2734
fix conflict and repush
charlesdong1991 Nov 8, 2019
0e249fc
move to groupby section
charlesdong1991 Nov 8, 2019
6331a26
Merge remote-tracking branch 'upstream/master' into fix_issue_28426
charlesdong1991 Nov 8, 2019
5e1e4e0
merge master
charlesdong1991 Nov 20, 2019
f7a219c
fix test for multiindex
charlesdong1991 Nov 20, 2019
cef6d3a
reformatting
charlesdong1991 Nov 20, 2019
2c11c36
solve conflicts
charlesdong1991 Nov 22, 2019
5172f46
solve conflict
charlesdong1991 Nov 22, 2019
6c7ee71
merge master and fix conflict
charlesdong1991 Dec 2, 2019
90ba1b4
remove redundant and expand whatsnew note
charlesdong1991 Dec 2, 2019
8eaecee
Merge remote-tracking branch 'upstream/master' into fix_issue_28426
charlesdong1991 Dec 3, 2019
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
Next Next commit
remove \n from docstring
  • Loading branch information
charlesdong1991 committed Dec 3, 2018
commit 7e461a18d9f6928132afec6f48ce968b3e989ba6
26 changes: 13 additions & 13 deletions pandas/core/arrays/datetimes.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def f(self):
return result

f.__name__ = name
f.__doc__ = docstring
f.__doc__ = "\n{}\n".format(docstring)
return property(f)


Expand Down Expand Up @@ -1072,19 +1072,19 @@ def date(self):

return tslib.ints_to_pydatetime(timestamps, box="date")

year = _field_accessor('year', 'Y', "\n The year of the datetime\n")
year = _field_accessor('year', 'Y', "The year of the datetime")
month = _field_accessor('month', 'M',
"\n The month as January=1, December=12 \n")
day = _field_accessor('day', 'D', "\nThe days of the datetime\n")
hour = _field_accessor('hour', 'h', "\nThe hours of the datetime\n")
minute = _field_accessor('minute', 'm', "\nThe minutes of the datetime\n")
second = _field_accessor('second', 's', "\nThe seconds of the datetime\n")
"The month as January=1, December=12")
day = _field_accessor('day', 'D', "The days of the datetime")
hour = _field_accessor('hour', 'h', "The hours of the datetime")
minute = _field_accessor('minute', 'm', "The minutes of the datetime")
second = _field_accessor('second', 's', "The seconds of the datetime")
microsecond = _field_accessor('microsecond', 'us',
"\nThe microseconds of the datetime\n")
"The microseconds of the datetime")
nanosecond = _field_accessor('nanosecond', 'ns',
"\nThe nanoseconds of the datetime\n")
"The nanoseconds of the datetime")
weekofyear = _field_accessor('weekofyear', 'woy',
"\nThe week ordinal of the year\n")
"The week ordinal of the year")
week = weekofyear
_dayofweek_doc = """
The day of the week with Monday=0, Sunday=6.
Expand Down Expand Up @@ -1129,12 +1129,12 @@ def date(self):
"The name of day in a week (ex: Friday)\n\n.. deprecated:: 0.23.0")

dayofyear = _field_accessor('dayofyear', 'doy',
"\nThe ordinal day of the year\n")
quarter = _field_accessor('quarter', 'q', "\nThe quarter of the date\n")
"The ordinal day of the year")
quarter = _field_accessor('quarter', 'q', "The quarter of the date")
days_in_month = _field_accessor(
'days_in_month',
'dim',
"\nThe number of days in the month\n")
"The number of days in the month")
daysinmonth = days_in_month
_is_month_doc = """
Indicates whether the date is the {first_or_last} day of the month.
Expand Down
16 changes: 8 additions & 8 deletions pandas/core/arrays/timedeltas.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def f(self):
return result

f.__name__ = name
f.__doc__ = docstring
f.__doc__ = "\n{}\n".format(docstring)
return property(f)


Expand Down Expand Up @@ -684,16 +684,16 @@ def to_pytimedelta(self):
return tslibs.ints_to_pytimedelta(self.asi8)

days = _field_accessor("days", "days",
"\nNumber of days for each element.\n")
"Number of days for each element.")
seconds = _field_accessor("seconds", "seconds",
"\nNumber of seconds (>= 0 and less than 1 day) "
"for each element.\n")
"Number of seconds (>= 0 and less than 1 day) "
"for each element.")
microseconds = _field_accessor("microseconds", "microseconds",
"\nNumber of microseconds (>= 0 and less "
"than 1 second) for each element.\n")
"Number of microseconds (>= 0 and less "
"than 1 second) for each element.")
nanoseconds = _field_accessor("nanoseconds", "nanoseconds",
"\nNumber of nanoseconds (>= 0 and less "
"than 1 microsecond) for each element.\n")
"Number of nanoseconds (>= 0 and less "
"than 1 microsecond) for each element.")

@property
def components(self):
Expand Down