updates

Author: davideferigato

lumix/timezonebot/convert.py

@@ -1,18 +1,17 @@
 import datetime
-import sys
 
+_zoneinfo_available = True
 try:
     from zoneinfo import ZoneInfo
-
-    USE_ZONEINFO = True
 except ImportError:
     try:
         import pytz
 
-        USE_ZONEINFO = False
+        _zoneinfo_available = False
     except ImportError:
-        print("Error: pytz not installed. Run: pip install pytz")
-        sys.exit(1)
+        _zoneinfo_available = False
+        ZoneInfo = None
+        pytz = None
 
 CITY_TIMEZONE = {
     "tokyo": "Asia/Tokyo",
@@ -29,11 +28,13 @@ def get_time_in_city(city: str) -> str:
         raise ValueError(f"Città '{city}' non trovata nel database")
     tz_name = CITY_TIMEZONE[city_lower]
     try:
-        if USE_ZONEINFO:
-            tz = ZoneInfo(tz_name)
+        if not _zoneinfo_available:
+            if pytz is None:
+                raise RuntimeError("pytz not installed")
+            tz = pytz.timezone(tz_name)
             now = datetime.datetime.now(tz)
         else:
-            tz = pytz.timezone(tz_name)
+            tz = ZoneInfo(tz_name)
             now = datetime.datetime.now(tz)
         return now.strftime("%Y-%m-%d %H:%M:%S %Z")
     except Exception as e:

lumix/timezones/convert.py

@@ -1,45 +1,46 @@
-import sys
 from datetime import datetime
 
+_zoneinfo_available = True
 try:
     from zoneinfo import ZoneInfo, available_timezones
-
-    USE_ZONEINFO = True
 except ImportError:
     try:
         import pytz
 
-        USE_ZONEINFO = False
-        # Definisci available_timezones fittizio per compatibilità
-        if not hasattr(sys.modules[__name__], "available_timezones"):
+        _zoneinfo_available = False
 
-            def available_timezones():
-                return []
+        def available_timezones():
+            return []
 
     except ImportError:
-        print("Error: pytz not installed. Run: pip install pytz")
-        sys.exit(1)
+        _zoneinfo_available = False
+        ZoneInfo = None
+        pytz = None
+
+        def available_timezones():
+            return []
 
 
 def convert_timezone(
     dt_str: str, from_tz: str, to_tz: str, date_format: str = "%Y-%m-%d %H:%M"
 ) -> str:
     try:
-        if USE_ZONEINFO:
-            # Verifica che i fusi siano validi
+        if not _zoneinfo_available:
+            if pytz is None:
+                raise ValueError("pytz not installed")
+            from_pytz = pytz.timezone(from_tz)
+            to_pytz = pytz.timezone(to_tz)
+            dt_naive = datetime.strptime(dt_str, date_format)
+            dt_from = from_pytz.localize(dt_naive)
+            dt_to = dt_from.astimezone(to_pytz)
+        else:
             if from_tz not in available_timezones():
                 raise ValueError(f"Fuso orario non valido: {from_tz}")
             if to_tz not in available_timezones():
                 raise ValueError(f"Fuso orario non valido: {to_tz}")
             dt_naive = datetime.strptime(dt_str, date_format)
             dt_from = dt_naive.replace(tzinfo=ZoneInfo(from_tz))
             dt_to = dt_from.astimezone(ZoneInfo(to_tz))
-        else:
-            from_pytz = pytz.timezone(from_tz)
-            to_pytz = pytz.timezone(to_tz)
-            dt_naive = datetime.strptime(dt_str, date_format)
-            dt_from = from_pytz.localize(dt_naive)
-            dt_to = dt_from.astimezone(to_pytz)
         return dt_to.strftime(date_format)
     except Exception as e:
         raise ValueError(f"Errore nella conversione: {e}")