pytz is not really a requirement

diff --git a/motioneye.py b/motioneye.py
index fa7633674ff09b891a70cdd54c2fdc43502322e7..ef752d919b7233c1fed02b6ededc08d5200f07c8 100755 (executable)
--- a/motioneye.py
+++ b/motioneye.py
@@ -193,13 +193,6 @@ def _test_requirements():
     except ImportError:
         has_pycurl = False
 
-    try:
-        import pytz  # @UnusedImport
-        has_pytz = True
-    
-    except ImportError:
-        has_pytz = False
-
     import mediafiles
     has_ffmpeg = mediafiles.find_ffmpeg() is not None
     
@@ -228,10 +221,6 @@ def _test_requirements():
         print('please install pycurl (python-pycurl)')
         ok = False
     
-    if not has_pytz:
-        print('please install pytz (python-pytz)')
-        ok = False
-    
     if not has_ffmpeg:
         print('please install ffmpeg')
         ok = False

diff --git a/static/js/main.js b/static/js/main.js
index 1db121f13e68c4b92ed36f90a6945145d8325ed1..c0a2f743b229dc603d4e06a1e90a72ad85730236 100644 (file)
--- a/static/js/main.js
+++ b/static/js/main.js
@@ -1580,7 +1580,9 @@ function dict2CameraUi(dict) {
     }
 
     if ($('#normalPasswordEntry').val()) { /* anonymous access is disabled */ 
-        snapshotUrl = addAuthParams('GET', snapshotUrl);
+        if (snapshotUrl) {
+            snapshotUrl = addAuthParams('GET', snapshotUrl);
+        }
         if (mjpgUrl) {
             mjpgUrl = addAuthParams('GET', mjpgUrl);
         }