Skip to content

Commit

Permalink
fix circular import
Browse files Browse the repository at this point in the history
  • Loading branch information
armisael committed Feb 25, 2014
1 parent 5be38a0 commit 6207124
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions dandelion/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
except ImportError:
from urllib import parse as urlparse

import requests

from dandelion.cache.base import NoCache
from dandelion.utils import AttributeDict

Expand Down Expand Up @@ -54,6 +52,7 @@ class BaseDandelionRequest(object):
REQUIRE_AUTH = True

def __init__(self, **kwargs):
import requests
from dandelion import default_config
self.uri = self._get_uri(host=kwargs.get('host'))
self.app_id = kwargs.get('app_id', default_config.get('app_id'))
Expand Down
2 changes: 1 addition & 1 deletion dandelion/cache/base.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import hashlib
import six


class NoCache(object):
Expand All @@ -14,6 +13,7 @@ def set(self, key, value):

@staticmethod
def get_key_for(**kwargs):
import six
input_s = ''
for key in sorted(kwargs):
input_s += '{}={},'.format(key, kwargs[key])
Expand Down
2 changes: 1 addition & 1 deletion dandelion/datagem.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from __future__ import unicode_literals

import warnings
import six

from dandelion.base import DandelionException, BaseDandelionRequest

Expand Down Expand Up @@ -131,6 +130,7 @@ def __getitem__(self, item):
def _parse_single_filter(key, value):
""" prepare a value for being used in the api
"""
import six
if isinstance(value, six.string_types):
value = '"%s"' % value
if value is None:
Expand Down

0 comments on commit 6207124

Please sign in to comment.