diff --git a/fbchat/_client.py b/fbchat/_client.py index 7c8b7ee..23a7916 100644 --- a/fbchat/_client.py +++ b/fbchat/_client.py @@ -15,11 +15,6 @@ from ._state import State import time import json -try: - from urllib.parse import urlparse, parse_qs -except ImportError: - from urlparse import urlparse, parse_qs - ACONTEXT = { "action_history": [ diff --git a/fbchat/_util.py b/fbchat/_util.py index 58fa657..5123590 100644 --- a/fbchat/_util.py +++ b/fbchat/_util.py @@ -8,6 +8,7 @@ from random import random from contextlib import contextmanager from mimetypes import guess_type from os.path import basename +from urllib.parse import parse_qs, urlparse import warnings import logging import requests @@ -19,22 +20,6 @@ from ._exception import ( FBchatPleaseRefresh, ) -try: - from urllib.parse import urlencode, parse_qs, urlparse - - basestring = (str, bytes) -except ImportError: - from urllib import urlencode - from urlparse import parse_qs, urlparse - - basestring = basestring - -# Python 2's `input` executes the input, whereas `raw_input` just returns the input -try: - input = raw_input -except NameError: - pass - # Log settings log = logging.getLogger("client") log.setLevel(logging.DEBUG)