fix(tests): condition for key error, python command;

- Added extra condition to catch possible key errors.
- Changed `python2` to just `python` in test class.

ckanapi/cli/dump.py

@@ -174,7 +174,8 @@ def reply(error, record=None):
             if arguments['--insecure']:
                 requests_kwargs = {'verify': False}
             include_users = False
-            if arguments['--include-users']:
+            if '--include-users' in arguments \
+            and arguments['--include-users']:
                 include_users = True
             obj = ckan.call_action(thing_show, {'id': name,
                 'include_datasets': False,

ckanapi/cli/load.py

@@ -175,7 +175,8 @@ def reply(action, error, response):
             requests_kwargs = {'verify': False}
 
         include_users = False
-        if arguments['--include-users']:
+        if '--include-users' in arguments \
+        and arguments['--include-users']:
             include_users = True
 
         if obj is not None:

ckanapi/tests/test_remote.py

@@ -34,7 +34,7 @@ class TestRemoteAction(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         script = os.path.join(os.path.dirname(__file__), 'mock/mock_ckan.py')
-        _mock_ckan = subprocess.Popen(['python2', script],
+        _mock_ckan = subprocess.Popen(['python', script],
             stdout=DEVNULL, stderr=DEVNULL)
         def kill_child():
             try: