fix failing test and rebase

Author: mroeschke

pandas/core/dtypes/cast.py

@@ -1003,7 +1003,7 @@ def maybe_cast_to_datetime(value, dtype, errors='raise'):
                         if is_datetime64:
                             value = to_datetime(value, errors=errors)._values
                         elif is_datetime64tz:
-                            # This block can be simplified once PR #17413 is 
+                            # This block can be simplified once PR #17413 is
                             # complete
                             is_dt_string = is_string_dtype(value)
                             value = to_datetime(value, errors=errors)

pandas/tests/series/test_constructors.py

@@ -707,10 +707,9 @@ def test_constructor_with_datetime_tz(self):
         expected = Series(pd.DatetimeIndex(['NaT', 'NaT'], tz='US/Eastern'))
         assert_series_equal(s, expected)
 
-    @pytest.mark.parametrize('arg, dtype',
+    @pytest.mark.parametrize('arg',
                              ['2013-01-01 00:00:00', pd.NaT, np.nan, None])
-    def test_constructor_with_naive_string_and_datetimetz_dtype(self, arg,
-                                                                dtype):
+    def test_constructor_with_naive_string_and_datetimetz_dtype(self, arg):
         # GH 17415: With naive string
         result = Series([arg], dtype='datetime64[ns, CET]')
         expected = Series([pd.Timestamp(arg, tz='CET')])