summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-12-05 18:52:42 +0100
committerAmber Brown <hawkowl@atleastfornow.net>2018-12-06 04:52:42 +1100
commit9a3e24a13d02d57660ae52a0b85bed681c56af00 (patch)
treed20f456d1383a3dc858ac332c565fdfe2b13cf58
parentImplement .well-known handling (#4262) (diff)
downloadsynapse-9a3e24a13d02d57660ae52a0b85bed681c56af00.tar.xz
drop undocumented dependency on dateutil (#4266)
It turns out we were relying on dateutil being pulled in transitively by
pysaml2. There's no need for that bloat.
-rw-r--r--changelog.d/4266.misc1
-rw-r--r--synapse/storage/__init__.py13
2 files changed, 7 insertions, 7 deletions
diff --git a/changelog.d/4266.misc b/changelog.d/4266.misc
new file mode 100644
index 0000000000..67fbde7484
--- /dev/null
+++ b/changelog.d/4266.misc
@@ -0,0 +1 @@
+drop undocumented dependency on dateutil
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index b23fb7e56c..24329879e5 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -14,12 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import datetime
+import calendar
 import logging
 import time
 
-from dateutil import tz
-
 from synapse.api.constants import PresenceState
 from synapse.storage.devices import DeviceStore
 from synapse.storage.user_erasure_store import UserErasureStore
@@ -357,10 +355,11 @@ class DataStore(RoomMemberStore, RoomStore,
         """
         Returns millisecond unixtime for start of UTC day.
         """
-        now = datetime.datetime.utcnow()
-        today_start = datetime.datetime(now.year, now.month,
-                                        now.day, tzinfo=tz.tzutc())
-        return int(time.mktime(today_start.timetuple())) * 1000
+        now = time.gmtime()
+        today_start = calendar.timegm((
+            now.tm_year, now.tm_mon, now.tm_mday, 0, 0, 0,
+        ))
+        return today_start * 1000
 
     def generate_user_daily_visits(self):
         """