From 6fb6e707ba6087b4536a6f0b880d3bdf3cfe6c3b Mon Sep 17 00:00:00 2001 From: Mads Marquart Date: Wed, 28 Aug 2019 21:26:59 +0200 Subject: [PATCH] Remove `six` dependency --- pyproject.toml | 1 - tests/utils.py | 12 ++---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 01fa829..0641406 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -52,7 +52,6 @@ Repository = "https://github.com/carpedm20/fbchat/" [tool.flit.metadata.requires-extra] test = [ "pytest~=4.0", - "six~=1.0", ] docs = [ "sphinx~=2.0", diff --git a/tests/utils.py b/tests/utils.py index 52863b5..76bcf9e 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -4,13 +4,11 @@ from __future__ import unicode_literals import threading import logging -import six import pytest from os import environ from random import randrange from contextlib import contextmanager -from six import viewitems from fbchat import Client from fbchat.models import ThreadType, EmojiSize, FBchatFacebookError, Sticker @@ -63,13 +61,7 @@ class ClientThread(threading.Thread): self.client.stopListening() -if six.PY2: - event_class = threading._Event -else: - event_class = threading.Event - - -class CaughtValue(event_class): +class CaughtValue(threading.Event): def set(self, res): self.res = res super(CaughtValue, self).set() @@ -85,7 +77,7 @@ def random_hex(length=20): def subset(a, **b): print(a) print(b) - return viewitems(b) <= viewitems(a) + return b.items() <= a.items() def load_variable(name, cache):