Merge pull request #96 from 3c2b2ff5/python3_first

modifed StringIO imports and mox3 import

.travis.yml

@@ -5,7 +5,7 @@ install:
  - travis_retry sudo apt-get install -y libnss-db libcurl4-gnutls-dev libgnutls-dev python-ldap python-mox python-pycurl
  - |-
     if [[ $TRAVIS_PYTHON_VERSION != '2.7' ]]; then
-      travis_retry sudo apt-get install -y python3-mox3 python3-ldap
+      travis_retry sudo apt-get install -y python3-mox3 python3-ldap python3-bsddb3
     fi
  - pip install .
  - travis_retry pip install -r requirements.txt

nss_cache/app_test.py

@@ -20,9 +20,12 @@
 
 import logging
 import os
-from io import BytesIO as StringIO
 import sys
 import unittest
+try:
+  from StringIO import StringIO
+except ImportError:
+  from io import StringIO
 
 from nss_cache import app
 

nss_cache/caches/caches_test.py

@@ -27,7 +27,7 @@
 try:
   import mox
 except ImportError:
-  import mox3
+  from mox3 import mox
 
 from nss_cache import config
 from nss_cache.caches import caches

nss_cache/caches/files_test.py

@@ -28,7 +28,7 @@
 try:
   import mox
 except ImportError:
-  import mox3
+  from mox3 import mox
 
 from nss_cache import config
 from nss_cache.maps import automount

nss_cache/caches/nssdb_test.py

@@ -35,7 +35,7 @@
 try:
   import mox
 except ImportError:
-  import mox3
+  from mox3 import mox
 
 from nss_cache import error
 

nss_cache/command.py

@@ -24,6 +24,10 @@
 import os
 import shutil
 from io import BytesIO as StringIO
+try:
+  from StringIO import StringIO
+except ImportError:
+  from io import StringIO
 import tempfile
 import time
 

nss_cache/command_test.py

@@ -23,16 +23,19 @@
 import os
 import pwd
 import shutil
-from io import BytesIO as StringIO
 import sys
 import tempfile
 import time
 import unittest
+try:
+  from StringIO import StringIO
+except ImportError:
+  from io import StringIO
 
 try:
   import mox
 except ImportError:
-  import mox3
+  from mox3 import mox
 
 from nss_cache import command
 from nss_cache import config

nss_cache/lock_test.py

@@ -34,7 +34,7 @@
 try:
   import mox
 except ImportError:
-  import mox3
+  from mox3 import mox
 
 from nss_cache import lock
 

nss_cache/nss_test.py

@@ -25,7 +25,7 @@
 try:
   import mox
 except ImportError:
-  import mox3
+  from mox3 import mox
 
 from nss_cache import config
 from nss_cache import error

nss_cache/sources/consulsource_test.py

@@ -2,7 +2,10 @@
 
 __author__ = 'hexedpackets@gmail.com (William Huba)'
 
-from io import BytesIO as StringIO
+try:
+  from StringIO import StringIO
+except ImportError:
+  from io import StringIO
 import unittest
 
 from nss_cache.maps import group

nss_cache/sources/httpsource_test.py

@@ -25,7 +25,7 @@
 try:
   import mox
 except ImportError:
-  import mox3
+  from mox3 import mox
 
 from nss_cache import error
 

nss_cache/sources/ldapsource_test.py

@@ -26,7 +26,7 @@
 try:
   import mox
 except ImportError:
-  import mox3
+  from mox3 import mox
 
 from nss_cache import error
 from nss_cache.maps import automount

nss_cache/sources/s3source_test.py

@@ -2,7 +2,10 @@
 
 __author__ = 'alexey.pikin@gmail.com'
 
-from io import BytesIO as StringIO
+try:
+  from StringIO import StringIO
+except ImportError:
+  from io import StringIO
 import unittest
 
 from nss_cache.maps import group

nss_cache/update/files_updater_test.py

@@ -30,7 +30,7 @@
 try:
   import mox
 except ImportError:
-  import mox3
+  from mox3 import mox
 
 from nss_cache import config
 from nss_cache import error

nss_cache/update/map_updater_test.py

@@ -28,7 +28,7 @@
 try:
   import mox
 except ImportError:
-  import mox3
+  from mox3 import mox
 
 from nss_cache.caches import caches
 from nss_cache.caches import files

nss_cache/update/updater_test.py

@@ -29,7 +29,7 @@
 try:
   import mox
 except ImportError:
-  import mox3
+  from mox3 import mox
 
 from nss_cache import config
 from nss_cache.update import updater

nss_cache/util/curl.py

@@ -22,7 +22,7 @@
 try:
   from cStringIO import StringIO
 except ImportError:
-  from io import BytesIO as StringIO
+  from io import StringIO
 import logging
 import pycurl
 

nss_cache/util/timestamps_test.py

@@ -27,7 +27,7 @@
 try:
   import mox
 except ImportError:
-  import mox3
+  from mox3 import mox
 
 from nss_cache.util import timestamps
 

requirements.txt

@@ -2,4 +2,7 @@ pytest
 boto3==1.7.36
 pycurl==7.43.0.2
 python-ldap
+python3-ldap
+python3-mox3
+python3-bsddb3
 mox==0.5.3