Merge pull request #202 from miaowware/hamstudy-extra-fix

fix offset-naive and offset-aware datetime conflict

CHANGELOG.md

@@ -7,6 +7,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 
 
+## [2.2.1] - 2020-02-20
+### Fixed
+- Fixed issue where some HamStudy pools will become unselectable.
+
+
 ## [2.2.0] - 2020-02-15
 ### Added
 - Added Trustee field to qrz command for club callsigns.

exts/study.py

@@ -14,6 +14,7 @@ from datetime import datetime
 import asyncio
 
 import aiohttp
+import pytz
 
 import discord.ext.commands as commands
 
@@ -88,8 +89,8 @@ class StudyCog(commands.Cog):
                 else:
                     # look at valid_from and expires dates to find the correct one
                     for p in pool_matches:
-                        valid_from = datetime.fromisoformat(pools[p]["valid_from"][:-1] + "+00:00")
-                        expires = datetime.fromisoformat(pools[p]["expires"][:-1] + "+00:00")
+                        valid_from = datetime.fromisoformat(pools[p]["valid_from"][:-1])
+                        expires = datetime.fromisoformat(pools[p]["expires"][:-1])
 
                         if valid_from < datetime.utcnow() < expires:
                             pool = p