Fix set() not accepting the tz argument

Author: sdispater

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [Unreleased]
+
+### Fixed
+
+- Fixed `set()` not acception the `tz` keyword argument.
+
+
 ## [1.5.0] - 2018-04-16
 
 ### Added

pendulum/pendulum.py

@@ -569,6 +569,11 @@ def microsecond_(self, microsecond):
         return self.set(microsecond=microsecond)
 
     def set(self, **kwargs):
+        if 'tz' in kwargs:
+            kwargs['tzinfo'] = kwargs.pop('tz')
+
+            return self.replace(**kwargs)
+
         kwargs['tzinfo'] = True
 
         return self._tz.convert(self.replace(**kwargs))

tests/pendulum_tests/test_fluent_setters.py

@@ -184,3 +184,19 @@ def test_replace_tzinfo_dst_with_error_transition_rule(self):
         d = Pendulum.create(2013, 3, 31, 2, 30)
 
         self.assertRaises(NonExistingTime, d.replace, tzinfo='Europe/Paris')
+
+    def test_set(self):
+        dt = pendulum.datetime(2016, 7, 2, 0, 41, 20)
+
+        assert dt.set(year=1995).year == 1995
+        assert dt.set(month=11).month == 11
+        assert dt.set(day=9).day == 9
+        assert dt.set(hour=12).hour == 12
+        assert dt.set(minute=34).minute == 34
+        assert dt.set(second=56).second == 56
+        assert dt.set(tz='Europe/Paris').timezone_name == 'Europe/Paris'
+
+        dt = pendulum.datetime(2013, 3, 31, 2, 30)
+        dt = dt.set(tz='Europe/Paris')
+
+        self.assertPendulum(dt, 2013, 3, 31, 3, 30)