@@ -214,7 +214,6 @@ cdef inline bint _is_fixed_offset(object tz):
214
214
return 0
215
215
return 1
216
216
217
-
218
217
_zero_time = datetime_time(0 , 0 )
219
218
_no_input = object ()
220
219
@@ -241,22 +240,22 @@ class Timestamp(_Timestamp):
241
240
unit : string
242
241
numpy unit used for conversion, if ts_input is int or float
243
242
244
- The other two forms mimic the parameters from datetime.datetime. They can
245
- be passed by either position or keyword, but not both mixed together.
243
+ The other two forms mimic the parameters from `` datetime.datetime`` . They
244
+ can be passed by either position or keyword, but not both mixed together.
246
245
247
246
:func:`datetime.datetime` Parameters
248
- ------------------------------
247
+ ------------------------------------
249
248
250
249
.. versionadded:: 0.18.2
251
250
252
251
year : int
253
252
month : int
254
253
day : int
255
- hour : int [ optional]
256
- minute : int [ optional]
257
- second : int [ optional]
258
- microsecond : int [ optional]
259
- tzinfo : datetime.tzinfo [ optional]
254
+ hour : int, optional, default is 0
255
+ minute : int, optional, default is 0
256
+ second : int, optional, default is 0
257
+ microsecond : int, optional, default is 0
258
+ tzinfo : datetime.tzinfo, optional, default is None
260
259
"""
261
260
262
261
@classmethod
@@ -319,17 +318,20 @@ class Timestamp(_Timestamp):
319
318
# four) and positional and keyword parameter names from pydatetime.
320
319
#
321
320
# There are three calling forms:
321
+ #
322
322
# - In the legacy form, the first parameter, ts_input, is required
323
- # and may be datetime-like, str, int, or float. The second parameter,
324
- # offset, is optional and may be str or DateOffset.
323
+ # and may be datetime-like, str, int, or float. The second
324
+ # parameter, offset, is optional and may be str or DateOffset.
325
+ #
325
326
# - ints in the first, second, and third arguments indicate
326
- # pydatetime positional arguments. Only the first 8 arguments
327
- # (standing in for year, month, day, hour, minute, second,
328
- # microsecond, tzinfo) may be non-None. As a shortcut, we just check
329
- # that the second argument is an int.
327
+ # pydatetime positional arguments. Only the first 8 arguments
328
+ # (standing in for year, month, day, hour, minute, second,
329
+ # microsecond, tzinfo) may be non-None. As a shortcut, we just
330
+ # check that the second argument is an int.
331
+ #
330
332
# - Nones for the first four (legacy) arguments indicate pydatetime
331
- # keyword arguments. year, month, and day are required. As a
332
- # shortcut, we just check that the first argument was not passed.
333
+ # keyword arguments. year, month, and day are required. As a
334
+ # shortcut, we just check that the first argument was not passed.
333
335
#
334
336
# Mixing pydatetime positional and keyword arguments is forbidden!
335
337
0 commit comments