Merge remote-tracking branch 'upstream/master' into combine-exception · pandas-dev/pandas@85fc5d8 (original) (raw)
`@@ -99,13 +99,13 @@ def _convert_and_box_cache(arg, cache_array, box, errors, name=None):
`
99
99
`result = Series(arg).map(cache_array)
`
100
100
`if box:
`
101
101
`if errors == 'ignore':
`
102
``
`-
return Index(result)
`
``
102
`+
return Index(result, name=name)
`
103
103
`else:
`
104
104
`return DatetimeIndex(result, name=name)
`
105
105
`return result.values
`
106
106
``
107
107
``
108
``
`-
def _return_parsed_timezone_results(result, timezones, box, tz):
`
``
108
`+
def _return_parsed_timezone_results(result, timezones, box, tz, name):
`
109
109
`"""
`
110
110
` Return results from array_strptime if a %z or %Z directive was passed.
`
111
111
``
`@@ -119,6 +119,9 @@ def _return_parsed_timezone_results(result, timezones, box, tz):
`
119
119
` True boxes result as an Index-like, False returns an ndarray
`
120
120
` tz : object
`
121
121
` None or pytz timezone object
`
``
122
`+
name : string, default None
`
``
123
`+
Name for a DatetimeIndex
`
``
124
+
122
125
` Returns
`
123
126
` -------
`
124
127
` tz_result : ndarray of parsed dates with timezone
`
`@@ -136,7 +139,7 @@ def _return_parsed_timezone_results(result, timezones, box, tz):
`
136
139
`in zip(result, timezones)])
`
137
140
`if box:
`
138
141
`from pandas import Index
`
139
``
`-
return Index(tz_results)
`
``
142
`+
return Index(tz_results, name=name)
`
140
143
`return tz_results
`
141
144
``
142
145
``
`@@ -209,7 +212,7 @@ def _convert_listlike_datetimes(arg, box, format, name=None, tz=None,
`
209
212
`if box:
`
210
213
`if errors == 'ignore':
`
211
214
`from pandas import Index
`
212
``
`-
return Index(result)
`
``
215
`+
return Index(result, name=name)
`
213
216
``
214
217
`return DatetimeIndex(result, tz=tz, name=name)
`
215
218
`return result
`
`@@ -252,7 +255,7 @@ def _convert_listlike_datetimes(arg, box, format, name=None, tz=None,
`
252
255
`arg, format, exact=exact, errors=errors)
`
253
256
`if '%Z' in format or '%z' in format:
`
254
257
`return _return_parsed_timezone_results(
`
255
``
`-
result, timezones, box, tz)
`
``
258
`+
result, timezones, box, tz, name)
`
256
259
`except tslibs.OutOfBoundsDatetime:
`
257
260
`if errors == 'raise':
`
258
261
`raise
`