Merge pull request #35 from ogenstad/py3

Work on Python 3 support

Author: mirceaulinic

.travis.yml

@@ -1,7 +1,10 @@
 language: python
 python:
 - 2.7
+- 3.4
+- 3.5
 install:
+- pip install -r requirements-dev.txt
 - pip install -r requirements.txt
 - pip install .
 - pip install coveralls

pyIOSXR/__init__.py

@@ -17,4 +17,4 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-from iosxr import IOSXR
+from pyIOSXR.iosxr import IOSXR

pyIOSXR/iosxr.py

@@ -361,7 +361,7 @@ def _execute_rpc(self, command_xml, delay_factor=.1):
         response = self._send_command(xml_rpc_command, delay_factor=delay_factor)
 
         try:
-            root = ET.fromstring(response)
+            root = ET.fromstring(str.encode(response))
         except ET.XMLSyntaxError as xml_err:
             if 'IteratorID="' in response:
                 raise IteratorIDError(self._ITERATOR_ID_ERROR_MSG, self)
@@ -517,7 +517,7 @@ def load_candidate_config(self, filename=None, config=None):
             self._execute_rpc(rpc_command)
         except InvalidInputError as e:
             self.discard_config()
-            raise InvalidInputError(e.message, self)
+            raise InvalidInputError(e.args[0], self)
 
     def get_candidate_config(self, merge=False, formal=False):
         """

requirements-dev.txt

@@ -0,0 +1 @@
+six

test/test.py

@@ -7,6 +7,7 @@
 import time
 import unittest
 from lxml import etree as ET
+from six import binary_type
 
 # ~~~ import pyIOSXR modules ~~~
 from pyIOSXR import IOSXR
@@ -59,7 +60,8 @@ def get_mock_file(command, format='xml'):
             fmt=format
         )
         fullpath = os.path.join(curr_dir, 'mock', filename)
-        return open(fullpath).read()
+        with open(fullpath) as file_data:
+            return file_data.read()
 
     def find_prompt(self):
         return self.get_mock_file('\n', format='txt')
@@ -271,7 +273,7 @@ def test_make_rpc_call_returns_XML(self):
 
         self.assertIsInstance(
             self.device.make_rpc_call('<Get><Configuration><NTP></NTP></Configuration></Get>'),
-            str
+            binary_type
         )
 
     def test_acquired_xml_agent(self):