Fixed issues with python2 failing

Sudo-Kid · Sudo-Kid · commit 7c1c3797857d · 2017-07-25T12:54:01.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,14 @@ env:
 
 language: python
 
+python:
+  - "2.7"
+  - "3.2"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+
 before_install:
   - sudo rm /usr/local/bin/docker-compose
   - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
diff --git a/gitlab/__init__.py b/gitlab/__init__.py
@@ -173,7 +173,7 @@ def login(self, email=None, password=None, user=None):
         :raise: ValueError
         """
         if user is not None:
-            data = {'login': user, 'password': password}
+            data = {'login': user, 'pasword': password}
         elif email is not None:
             data = {'email': email, 'password': password}
         else:
diff --git a/gitlab_tests/test_v91/test_common.py b/gitlab_tests/test_v91/test_common.py
@@ -1,4 +1,4 @@
-from unittest import mock
+from mock import Mock
 
 import requests
 import responses
@@ -12,7 +12,7 @@
 
 class TestSuccessOrRaise(BaseTest):
     def test_success_or_raise_without_error(self):
-        response = mock.MagicMock()
+        response = Mock()
         response_config = {
             'status_code': 200,
             'json.return_value': post_users_error
diff --git a/gitlab_tests/test_v91/test_users.py b/gitlab_tests/test_v91/test_users.py
@@ -1,6 +1,3 @@
-import os
-from unittest import TestCase
-
 import responses
 from requests.exceptions import HTTPError
 
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -1,3 +1,4 @@
 -r requirements.txt
 responses
 coverage
+mock
