Merge commit 'a3f11567d' into dinsic

* commit 'a3f11567d':
  Replace all remaining six usage with native Python 3 equivalents (#7704)

1 files changed, 2 insertions, 4 deletions

diff --git a/synapse/config/_base.py b/synapse/config/_base.py

index 128617b8b3..f2830c609d 100644
--- a/synapse/config/_base.py
+++ b/synapse/config/_base.py
@@ -23,8 +23,6 @@ from io import open as io_open
 from textwrap import dedent
 from typing import Any, MutableMapping, Optional
 
-from six import integer_types
-
 import yaml
 
 
@@ -118,7 +116,7 @@ class Config(object):
 
     @staticmethod
     def parse_size(value):
-        if isinstance(value, integer_types):
+        if isinstance(value, int):
             return value
         sizes = {"K": 1024, "M": 1024 * 1024}
         size = 1
@@ -130,7 +128,7 @@ class Config(object):
 
     @staticmethod
     def parse_duration(value):
-        if isinstance(value, integer_types):
+        if isinstance(value, int):
             return value
         second = 1000
         minute = 60 * second