Merge remote-tracking branch 'ebag/SorryNotSorryBlitzmann' into SorryNotSorryBlitzmann

service/eveapi.py

@@ -346,6 +346,19 @@ class _Context(object):
         # perform arcane attribute majick trick
         return _Context(self._root, self._path + "/" + this, self.parameters)
 
+    def __call__(self, **kw):
+        if kw:
+            # specified keywords override contextual ones
+            for k, v in self.parameters.iteritems():
+                if k not in kw:
+                    kw[k] = v
+        else:
+            # no keywords provided, just update with contextual ones.
+            kw.update(self.parameters)
+
+        # now let the root context handle it further
+        return self._root(self._path, **kw)
+
 
 class _AuthContext(_Context):
     def character(self, characterID):

service/pycrest/eve.py

@@ -12,14 +12,12 @@ import config
 from service.pycrest.compat import bytes_, text_
 from service.pycrest.errors import APIException
 
-try:
-    from urllib.parse import urlparse, urlunparse, parse_qsl
-except ImportError:  # pragma: no cover
-    from urlparse import urlparse, urlunparse, parse_qsl
+from urlparse import urlparse, urlunparse, parse_qsl
 
 try:
     import pickle
 except ImportError:  # pragma: no cover
+    # noinspection PyPep8Naming
     import cPickle as pickle
 
 logger = logging.getLogger("pycrest.eve")