nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-18 20:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #44604 from akhilnarang/drop-pytz-usage

Browse Source 
refactor: drop pytz
This commit is contained in:
ruthra kumar
2024-12-13 15:02:14 +05:30
committed by GitHub
parent d8f55923c9 af3743f09e
commit 2c5b5d4117
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/support/doctype/service_level_agreement/service_level_agreement.py
View File

@@ -2,7 +2,7 @@
# For license information, please see license.txt # For license information, please see license.txt
from datetime import datetime from datetime import datetime, timezone
import frappe import frappe
from frappe import _ from frappe import _
@@ -1007,13 +1007,13 @@ def now_datetime(user):
def convert_utc_to_user_timezone(utc_timestamp, user): def convert_utc_to_user_timezone(utc_timestamp, user):
from pytz import UnknownTimeZoneError, timezone from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
user_tz = get_tz(user) user_tz = get_tz(user)
utcnow = timezone("UTC").localize(utc_timestamp) utcnow = utc_timestamp.replace(tzinfo=timezone.utc)
try: try:
return utcnow.astimezone(timezone(user_tz)) return utcnow.astimezone(ZoneInfo(user_tz))
except UnknownTimeZoneError: except ZoneInfoNotFoundError:
return utcnow return utcnow

5
erpnext/utilities/doctype/video/video.py
View File

@@ -6,7 +6,6 @@ import re
from datetime import datetime from datetime import datetime
import frappe import frappe
import pytz
from frappe import _ from frappe import _
from frappe.model.document import Document from frappe.model.document import Document
from frappe.utils import cint from frappe.utils import cint
@@ -77,6 +76,8 @@ def get_frequency(value):
def update_youtube_data(): def update_youtube_data():
from zoneinfo import ZoneInfo
# Called every 30 minutes via hooks # Called every 30 minutes via hooks
video_settings = frappe.get_cached_doc("Video Settings") video_settings = frappe.get_cached_doc("Video Settings")
if not video_settings.enable_youtube_tracking: if not video_settings.enable_youtube_tracking:
@@ -84,7 +85,7 @@ def update_youtube_data():
frequency = get_frequency(video_settings.frequency) frequency = get_frequency(video_settings.frequency)
time = datetime.now() time = datetime.now()
timezone = pytz.timezone(get_system_timezone()) timezone = ZoneInfo(get_system_timezone())
site_time = time.astimezone(timezone) site_time = time.astimezone(timezone)
if frequency == 30: if frequency == 30:

14
erpnext/www/book_appointment/index.py
View File

@@ -1,8 +1,8 @@
import datetime import datetime
import json import json
import zoneinfo
import frappe import frappe
import pytz
from frappe import _ from frappe import _
from frappe.utils.data import get_system_timezone from frappe.utils.data import get_system_timezone
@@ -38,9 +38,7 @@ def get_appointment_settings():
@frappe.whitelist(allow_guest=True) @frappe.whitelist(allow_guest=True)
def get_timezones(): def get_timezones():
import pytz return zoneinfo.available_timezones()
return pytz.all_timezones
@frappe.whitelist(allow_guest=True) @frappe.whitelist(allow_guest=True)
@@ -125,17 +123,17 @@ def filter_timeslots(date, timeslots):
def convert_to_guest_timezone(guest_tz, datetimeobject): def convert_to_guest_timezone(guest_tz, datetimeobject):
guest_tz = pytz.timezone(guest_tz) guest_tz = zoneinfo.ZoneInfo(guest_tz)
local_timezone = pytz.timezone(get_system_timezone()) local_timezone = zoneinfo.ZoneInfo(get_system_timezone())
datetimeobject = local_timezone.localize(datetimeobject) datetimeobject = local_timezone.localize(datetimeobject)
datetimeobject = datetimeobject.astimezone(guest_tz) datetimeobject = datetimeobject.astimezone(guest_tz)
return datetimeobject return datetimeobject
def convert_to_system_timezone(guest_tz, datetimeobject): def convert_to_system_timezone(guest_tz, datetimeobject):
guest_tz = pytz.timezone(guest_tz) guest_tz = zoneinfo.ZoneInfo.timezone(guest_tz)
datetimeobject = guest_tz.localize(datetimeobject) datetimeobject = guest_tz.localize(datetimeobject)
system_tz = pytz.timezone(get_system_timezone()) system_tz = zoneinfo.ZoneInfo.timezone(get_system_timezone())
datetimeobject = datetimeobject.astimezone(system_tz) datetimeobject = datetimeobject.astimezone(system_tz)
return datetimeobject return datetimeobject