fix: clean up Python 2 remnants and resolve deprecation warnings

src/oaipmh/server.py

@@ -1,6 +1,6 @@
 from lxml.etree import ElementTree, Element, SubElement
 from lxml import etree
-from datetime import datetime
+from datetime import datetime, timezone
 try:
     from urllib.parse import urlencode, quote, unquote
 except ImportError:
@@ -174,7 +174,7 @@ def _outputBasicEnvelope(self, **kw):
         e_responseDate = SubElement(e_oaipmh, nsoai('responseDate'))
         # date should be first possible moment
         e_responseDate.text = datetime_to_datestamp(
-            datetime.utcnow().replace(microsecond=0))
+            datetime.now(timezone.utc).replace(microsecond=0, tzinfo=None))
         e_request = SubElement(e_oaipmh, nsoai('request'))
         for key, value in kw.items():
             if key == 'from_':

src/oaipmh/tests/fakeclient.py

@@ -1,10 +1,7 @@
 from oaipmh import client, common
 import os.path
 from datetime import datetime
-try:
-    from urllib.parse import urlencode
-except ImportError:
-    from urllib import urlencode
+from urllib.parse import urlencode
 
 
 class FakeClient(client.BaseClient):
@@ -18,7 +15,7 @@ def makeRequest(self, **kw):
         # sort it to get stable behavior
         return self._mapping[getRequestKey(kw)]
 
-class TestError(Exception):
+class FakeRequestError(Exception):
     def __init__(self, kw):
         self.kw = kw
 
@@ -31,7 +28,7 @@ def makeRequest(self, **kw):
         # even more fake, we'll simply raise an exception with the request
         # this can be caught by the test to see whether the request uses
         # day granularity..
-        raise TestError(kw)
+        raise FakeRequestError(kw)
 
     def identify(self):
         return common.Identify(

src/oaipmh/tests/test_client.py

@@ -1,18 +1,11 @@
 from unittest import TestCase
-try:
-    from unittest import mock
-except ImportError:  # python < 3.3
-    import mock
+from unittest import mock
 
-from .fakeclient import FakeClient, GranularityFakeClient, TestError
+from .fakeclient import FakeClient, GranularityFakeClient, FakeRequestError
 import os
 from datetime import datetime
-try:
-    import urllib.request as urllib2
-    URLOPEN_PATH = 'urllib.request.urlopen'
-except ImportError:
-    import urllib2
-    URLOPEN_PATH = 'urllib2.urlopen'
+import urllib.request as urllib2
+URLOPEN_PATH = 'urllib.request.urlopen'
 
 from oaipmh import common, metadata, validation, client
 
@@ -171,15 +164,15 @@ def test_day_granularity(self):
         try:
             fakeclient.listRecords(from_=datetime(2003, 4, 10, 14, 0),
                                    metadataPrefix='oai_dc')
-        except TestError as e:
+        except FakeRequestError as e:
             self.assertEqual('2003-04-10T14:00:00Z', e.kw['from'])
         fakeclient = GranularityFakeClient(granularity='YYYY-MM-DD')
         fakeclient.updateGranularity()
         try:
             fakeclient.listRecords(from_=datetime(2003, 4, 10, 14, 0),
                                    until=datetime(2004, 6, 17, 15, 30),
                                    metadataPrefix='oai_dc')
-        except TestError as e:
+        except FakeRequestError as e:
             self.assertEqual('2003-04-10', e.kw['from'])
             self.assertEqual('2004-06-17', e.kw['until'])