diff --git a/fbchat/__init__.py b/fbchat/__init__.py index 3bdd86f..e5acc44 100644 --- a/fbchat/__init__.py +++ b/fbchat/__init__.py @@ -8,8 +8,9 @@ from __future__ import unicode_literals # These imports are far too general, but they're needed for backwards compatbility. from .utils import * -from .graphql import * from .models import * + +from ._graphql import graphql_queries_to_json, graphql_response_to_json, GraphQL from ._client import Client __title__ = "fbchat" diff --git a/fbchat/_client.py b/fbchat/_client.py index cbd0783..e73e413 100644 --- a/fbchat/_client.py +++ b/fbchat/_client.py @@ -1,6 +1,6 @@ # -*- coding: UTF-8 -*- - from __future__ import unicode_literals + import requests import urllib from uuid import uuid1 @@ -10,7 +10,7 @@ from mimetypes import guess_type from collections import OrderedDict from ._util import * from .models import * -from .graphql import * +from ._graphql import graphql_queries_to_json, graphql_response_to_json, GraphQL import time import json diff --git a/fbchat/client.py b/fbchat/client.py index 846c9db..9244327 100644 --- a/fbchat/client.py +++ b/fbchat/client.py @@ -4,5 +4,4 @@ from __future__ import unicode_literals from .utils import * from .models import * -from .graphql import * from ._client import Client diff --git a/fbchat/graphql.py b/fbchat/graphql.py deleted file mode 100644 index 81ce8eb..0000000 --- a/fbchat/graphql.py +++ /dev/null @@ -1,14 +0,0 @@ -# -*- coding: UTF-8 -*- -"""This file is here to maintain backwards compatability.""" -from __future__ import unicode_literals - -from .models import * -from .utils import * -from ._graphql import ( - FLAGS, - WHITESPACE, - ConcatJSONDecoder, - graphql_queries_to_json, - graphql_response_to_json, - GraphQL, -)