12 files changed, 35 insertions, 35 deletions
diff --git a/src/webob/acceptparse.py b/src/webob/acceptparse.py
index 0ac3a5b..19443b6 100644
--- a/src/webob/acceptparse.py
+++ b/src/webob/acceptparse.py
@@ -113,7 +113,7 @@ class AcceptOffer(namedtuple("AcceptOffer", ["type", "subtype", "params"])):
         return Accept._form_media_range(value, self.params)
 
 
-class Accept(object):
+class Accept:
     """
     Represent an ``Accept`` header.
 
@@ -1790,7 +1790,7 @@ def accept_property():
     return property(fget, fset, fdel, textwrap.dedent(doc))
 
 
-class AcceptCharset(object):
+class AcceptCharset:
     """
     Represent an ``Accept-Charset`` header.
 
@@ -2784,7 +2784,7 @@ def accept_charset_property():
     return property(fget, fset, fdel, textwrap.dedent(doc))
 
 
-class AcceptEncoding(object):
+class AcceptEncoding:
     """
     Represent an ``Accept-Encoding`` header.
 
@@ -3827,7 +3827,7 @@ def accept_encoding_property():
     return property(fget, fset, fdel, textwrap.dedent(doc))
 
 
-class AcceptLanguage(object):
+class AcceptLanguage:
     """
     Represent an ``Accept-Language`` header.
 
diff --git a/src/webob/byterange.py b/src/webob/byterange.py
index 435282b..44db453 100644
--- a/src/webob/byterange.py
+++ b/src/webob/byterange.py
@@ -6,7 +6,7 @@ _rx_range = re.compile(r"bytes *= *(\d*) *- *(\d*)", flags=re.I)
 _rx_content_range = re.compile(r"bytes (?:(\d+)-(\d+)|[*])/(?:(\d+)|[*])")
 
 
-class Range(object):
+class Range:
     """
     Represents the Range header.
     """
@@ -85,7 +85,7 @@ class Range(object):
         return cls(start, end)
 
 
-class ContentRange(object):
+class ContentRange:
 
     """
     Represents the Content-Range header
diff --git a/src/webob/cachecontrol.py b/src/webob/cachecontrol.py
index 1278329..1029344 100644
--- a/src/webob/cachecontrol.py
+++ b/src/webob/cachecontrol.py
@@ -63,7 +63,7 @@ token_re = re.compile(r'([a-zA-Z][a-zA-Z_-]*)\s*(?:=(?:"([^"]*)"|([^ \t",;]*)))?
 need_quote_re = re.compile(r"[^a-zA-Z0-9._-]")
 
 
-class exists_property(object):
+class exists_property:
     """
     Represents a property that either is listed in the Cache-Control
     header, or is not listed (has no value)
@@ -95,7 +95,7 @@ class exists_property(object):
         self.__set__(obj, False)
 
 
-class value_property(object):
+class value_property:
     """
     Represents a property that has a value in the Cache-Control header.
 
@@ -139,7 +139,7 @@ class value_property(object):
             del obj.properties[self.prop]
 
 
-class CacheControl(object):
+class CacheControl:
 
     """
     Represents the Cache-Control header.
diff --git a/src/webob/client.py b/src/webob/client.py
index 89b9223..6ec7742 100644
--- a/src/webob/client.py
+++ b/src/webob/client.py
@@ -96,7 +96,7 @@ class SendRequest:
         except socket.timeout:
             resp = exc.HTTPGatewayTimeout()
             return resp(environ, start_response)
-        except (socket.error, socket.gaierror) as e:
+        except (OSError, socket.gaierror) as e:
             if (isinstance(e, socket.error) and e.args[0] == -2) or (
                 isinstance(e, socket.gaierror) and e.args[0] == 8
             ):
diff --git a/src/webob/cookies.py b/src/webob/cookies.py
index b387211..f4c77e6 100644
--- a/src/webob/cookies.py
+++ b/src/webob/cookies.py
@@ -613,7 +613,7 @@ def make_cookie(
     return morsel.serialize()
 
 
-class JSONSerializer(object):
+class JSONSerializer:
     """ A serializer which uses `json.dumps`` and ``json.loads``"""
 
     def dumps(self, appstruct):
@@ -626,7 +626,7 @@ class JSONSerializer(object):
         return json.loads(text_(bstruct, encoding="utf-8"))
 
 
-class Base64Serializer(object):
+class Base64Serializer:
     """ A serializer which uses base64 to encode/decode data"""
 
     def __init__(self, serializer=None):
@@ -660,7 +660,7 @@ class Base64Serializer(object):
         return self.serializer.loads(cstruct)
 
 
-class SignedSerializer(object):
+class SignedSerializer:
     """
     A helper to cryptographically sign arbitrary content using HMAC.
 
@@ -746,7 +746,7 @@ class SignedSerializer(object):
 _default = object()
 
 
-class CookieProfile(object):
+class CookieProfile:
     """
     A helper class that helps bring some sanity to the insanity that is cookie
     handling.
diff --git a/src/webob/dec.py b/src/webob/dec.py
index 237266a..02ec255 100644
--- a/src/webob/dec.py
+++ b/src/webob/dec.py
@@ -13,7 +13,7 @@ from webob.util import bytes_
 __all__ = ["wsgify"]
 
 
-class wsgify(object):
+class wsgify:
     """Turns a request-taking, response-returning function into a WSGI
     app
 
@@ -295,7 +295,7 @@ class wsgify(object):
         return args, kwargs
 
 
-class _UnboundMiddleware(object):
+class _UnboundMiddleware:
     """A `wsgify.middleware` invocation that has not yet wrapped a
     middleware function; the intermediate object when you do
     something like ``@wsgify.middleware(RequestClass=Foo)``
@@ -316,7 +316,7 @@ class _UnboundMiddleware(object):
         return self.wrapper_class.middleware(func, app=app, **self.kw)
 
 
-class _MiddlewareFactory(object):
+class _MiddlewareFactory:
     """A middleware that has not yet been bound to an application or
     configured.
     """
diff --git a/src/webob/etag.py b/src/webob/etag.py
index e0ee8d5..6e91d45 100644
--- a/src/webob/etag.py
+++ b/src/webob/etag.py
@@ -34,7 +34,7 @@ def etag_property(key, default, rfc_section, strong=True):
     return property(fget, fset, fdel, doc=doc)
 
 
-class _AnyETag(object):
+class _AnyETag:
     """
     Represents an ETag of *, or a missing ETag when matching is 'safe'
     """
@@ -57,7 +57,7 @@ class _AnyETag(object):
 AnyETag = _AnyETag()
 
 
-class _NoETag(object):
+class _NoETag:
     """
     Represents a missing ETag when matching is unsafe
     """
@@ -83,7 +83,7 @@ NoETag = _NoETag()
 # TODO: convert into a simple tuple
 
 
-class ETagMatcher(object):
+class ETagMatcher:
     def __init__(self, etags):
         self.etags = etags
 
@@ -114,7 +114,7 @@ class ETagMatcher(object):
         return ", ".join(map('"%s"'.__mod__, self.etags))
 
 
-class IfRange(object):
+class IfRange:
     def __init__(self, etag):
         self.etag = etag
 
@@ -149,7 +149,7 @@ class IfRange(object):
     __bool__ = __nonzero__  # python 3
 
 
-class IfRangeDate(object):
+class IfRangeDate:
     def __init__(self, date):
         self.date = date
 
diff --git a/src/webob/exc.py b/src/webob/exc.py
index 5ca71b9..826ce05 100644
--- a/src/webob/exc.py
+++ b/src/webob/exc.py
@@ -181,7 +181,7 @@ br_re = re.compile(r"<br.*?>", re.I | re.S)
 comment_re = re.compile(r"<!--|-->")
 
 
-class _lazified(object):
+class _lazified:
     def __init__(self, func, value):
         self.func = func
         self.value = value
@@ -1303,7 +1303,7 @@ class HTTPNetworkAuthenticationRequired(HTTPServerError):
     explanation = "Network authentication is required"
 
 
-class HTTPExceptionMiddleware(object):
+class HTTPExceptionMiddleware:
     """
     Middleware that catches exceptions in the sub-application.  This
     does not catch exceptions in the app_iter; only during the initial
diff --git a/src/webob/multidict.py b/src/webob/multidict.py
index 38ca203..0c148e7 100644
--- a/src/webob/multidict.py
+++ b/src/webob/multidict.py
@@ -444,7 +444,7 @@ class NestedMultiDict(MultiDict):
     __iter__ = keys
 
 
-class NoVars(object):
+class NoVars:
     """
     Represents no variables; used when no variables
     are applicable.
diff --git a/src/webob/request.py b/src/webob/request.py
index cb33d52..7408255 100644
--- a/src/webob/request.py
+++ b/src/webob/request.py
@@ -80,7 +80,7 @@ _LATIN_ENCODINGS = (
 )
 
 
-class BaseRequest(object):
+class BaseRequest:
     # The limit after which request bodies should be stored on disk
     # if they are read in (under this, and the request body is stored
     # in memory):
@@ -1478,7 +1478,7 @@ class BaseRequest(object):
         return obj
 
 
-class AdhocAttrMixin(object):
+class AdhocAttrMixin:
     _setattr_stacklevel = 3
 
     def __setattr__(self, attr, value, DEFAULT=DEFAULT):
@@ -1741,7 +1741,7 @@ def _is_utf8(charset):
         return charset.lower().replace("-", "") == "utf8"
 
 
-class Transcoder(object):
+class Transcoder:
     def __init__(self, charset, errors="strict"):
         self.charset = charset  # source charset
         self.errors = errors  # unicode errors
diff --git a/src/webob/response.py b/src/webob/response.py
index f5e59d4..435ea62 100644
--- a/src/webob/response.py
+++ b/src/webob/response.py
@@ -57,7 +57,7 @@ _gzip_header = b"\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff"
 _marker = object()
 
 
-class Response(object):
+class Response:
     """
     Represents a WSGI response.
 
@@ -1500,7 +1500,7 @@ def iter_file(file, block_size=1 << 18):  # 256Kb
         yield data
 
 
-class ResponseBodyFile(object):
+class ResponseBodyFile:
     mode = "wb"
     closed = False
 
@@ -1544,7 +1544,7 @@ class ResponseBodyFile(object):
         return sum([len(chunk) for chunk in self.response.app_iter])
 
 
-class AppIterRange(object):
+class AppIterRange:
     """
     Wraps an ``app_iter``, returning just a range of bytes.
     """
@@ -1605,7 +1605,7 @@ class AppIterRange(object):
         iter_close(self.app_iter)
 
 
-class EmptyResponse(object):
+class EmptyResponse:
     """
     An empty WSGI response.
 
diff --git a/src/webob/static.py b/src/webob/static.py
index 52ad566..27f1324 100644
--- a/src/webob/static.py
+++ b/src/webob/static.py
@@ -16,7 +16,7 @@ mimetypes.add_type("image/x-icon", ".ico")  # not among defaults
 BLOCK_SIZE = 1 << 16
 
 
-class FileApp(object):
+class FileApp:
     """An application that will send the file at the given filename.
 
     Adds a mime type based on `mimetypes.guess_type()`.
@@ -62,7 +62,7 @@ class FileApp(object):
         ).conditional_response_app
 
 
-class FileIter(object):
+class FileIter:
     def __init__(self, file):
         self.file = file
 
@@ -104,7 +104,7 @@ class FileIter(object):
     __iter__ = app_iter_range
 
 
-class DirectoryApp(object):
+class DirectoryApp:
     """An application that serves up the files in a given directory.
 
     This will serve index files (by default ``index.html``), or set