switched to requests

.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 *.pyc
 __pycache__
+/source/lib

source/almanac.py

@@ -7,17 +7,15 @@
 #import requests
 import json
 import sys
-import urllib.request 
-import urllib.parse 
+import requests
 from datetime import datetime
 import datetime as date2
 import re, os, time
 
-
 from config import LOCATION, FORMATSTRING, SPECIAL_DAY
 
 FORMATSTRING = FORMATSTRING+"--%Z--" #adding local timezone
-FORMATSTRING = f'"{FORMATSTRING}"'  #enclosing in quotes
+#FORMATSTRING = f'"{FORMATSTRING}"'  #enclosing in quotes
 
 
 def log(s, *args):
@@ -31,26 +29,24 @@ def get_weather(location):
 
 
     myURL= "http://wttr.in/"
-    params ="format="+ urllib.parse.quote(FORMATSTRING,safe='%(),')
-    paramsJ = "format=j1"
+
+    payload = {'format': FORMATSTRING}
+    payload_j = {'format': "j1"}
+    #paramsJ = "format=j1"
     location = location.strip()
     location=re.sub(" ", '+', location)
 
-
-    myURL= "http://wttr.in/" + location + "?" + params
-
-    with urllib.request.urlopen(myURL) as response: 
-        myData = json.load(response)
+    resp = requests.get(f"http://wttr.in/{loc}", params=payload)
+    myData = resp.text.strip()
+    log (myData)
 
     #fetching also the JSON output for extra information
-    myURL= "http://wttr.in/" + location + "?" + paramsJ
-
-    with urllib.request.urlopen(myURL) as response: 
-            myDataJ = json.load(response)
-
+    resp_j = requests.get(f"http://wttr.in/{loc}", params=payload_j) 
 
-    myLocation = myDataJ['nearest_area'][0]['areaName'][0]['value'] #getting the location from the output
+    myResults =  (resp_j.json())
+    myLocation = myResults['nearest_area'][0]['areaName'][0]['value'] #getting the location from the output
 
+
     # extracting timezone
     timeZonePattern="--(.*?)--"
 

source/info.plist

@@ -167,7 +167,7 @@
 				<key>script</key>
 				<string>export PATH=/opt/homebrew/bin:/usr/local/bin:$PATH
 export PYTHONPATH="$PWD/lib"
-python3 almanac_requests.py $1 "${LOCATION}"</string>
+python3 almanac.py $1 "${LOCATION}"</string>
 				<key>scriptargtype</key>
 				<integer>1</integer>
 				<key>scriptfile</key>
@@ -346,7 +346,7 @@ python3 almanac_requests.py $1 "${LOCATION}"</string>
 	<key>variablesdontexport</key>
 	<array/>
 	<key>version</key>
-	<string>1.0.1</string>
+	<string>1.1</string>
 	<key>webaddress</key>
 	<string>https://github.com/giovannicoppola/alfred-almanac</string>
 </dict>