add tox file. fix some tests

Author: ikeeip

conf_publisher/confluence.py

@@ -206,13 +206,13 @@ def is_equal(cls, first, second):
 
         # 'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         # 'xsi:schemaLocation="http://www.atlassian.com/schema/confluence/4/ac/ confluence.xsd" '
-        wrapper = '<?xml version="1.0" encoding="UTF-8"?>' \
-                  '<!DOCTYPE ac:confluence SYSTEM "confluence.dtd">' \
-                  '<ac:confluence xmlns:ac="http://www.atlassian.com/schema/confluence/4/ac/" ' \
-                  'xmlns:ri="http://www.atlassian.com/schema/confluence/4/ri/">{}</ac:confluence>'
+        wrapper = u'<?xml version="1.0" encoding="UTF-8"?>' \
+                  u'<!DOCTYPE ac:confluence SYSTEM "confluence.dtd">' \
+                  u'<ac:confluence xmlns:ac="http://www.atlassian.com/schema/confluence/4/ac/" ' \
+                  u'xmlns:ri="http://www.atlassian.com/schema/confluence/4/ri/">{}</ac:confluence>'
 
-        first_xml = etree.XML(wrapper.format(first.encode(encoding='utf-8')), parser=cls._parser())
-        second_xml = etree.XML(wrapper.format(second.encode(encoding='utf-8')), parser=cls._parser())
+        first_xml = etree.XML(wrapper.format(first).encode(encoding='utf-8'), parser=cls._parser())
+        second_xml = etree.XML(wrapper.format(second).encode(encoding='utf-8'), parser=cls._parser())
         return cls._elements_equal(first_xml, second_xml)
 
     @staticmethod
@@ -225,7 +225,6 @@ def _parser():
         # fix unknown entity
         # http://stackoverflow.com/questions/7237466/python-elementtree-support-for-parsing-unknown-xml-entities
         parser = etree.XMLParser()
-        parser.parser.UseForeignDTD(True)
         parser.entity['nbsp'] = 'nbsp'
         return parser
 

setup.py

@@ -20,7 +20,9 @@
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Topic :: Software Development :: Documentation',
     ],
     entry_points={

tests/data_providers/test_sphinx_fjson_data_provider.py

@@ -9,23 +9,21 @@ class SphinxFJsonDataProviderTestCase(TestCase):
     tests_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
     def test_get_source_1(self):
-        result = SphinxFJsonDataProvider().get_source('file')
+        result = SphinxFJsonDataProvider(root_dir=self.tests_root).get_source('file')
         expected = os.path.join(self.tests_root, 'docs/build/json/file.fjson')
-
         self.assertEqual(expected, result)
 
     def test_get_source_2(self):
-        result = SphinxFJsonDataProvider(root_dir='./', base_dir='result').get_source('file')
+        result = SphinxFJsonDataProvider(root_dir=self.tests_root, base_dir='result').get_source('file')
         expected = os.path.join(self.tests_root, 'result/file.fjson')
-
         self.assertEqual(expected, result)
 
     def test_get_image(self):
-        result = SphinxFJsonDataProvider(base_dir='fixtures').get_image('test_image.png')
+        result = SphinxFJsonDataProvider(root_dir=self.tests_root, base_dir='fixtures').get_image('test_image.png')
         expected = os.path.join(self.tests_root, 'fixtures/_images/test_image.png')
         self.assertEqual(expected, result)
 
     def test_get_attachment(self):
-        result = SphinxFJsonDataProvider(base_dir='fixtures').get_attachment('test_download.txt')
+        result = SphinxFJsonDataProvider(root_dir=self.tests_root, base_dir='fixtures').get_attachment('test_download.txt')
         expected = os.path.join(self.tests_root, 'fixtures/_downloads/test_download.txt')
         self.assertEqual(expected, result)

tests/test_publish.py

@@ -1,5 +1,6 @@
 from unittest import TestCase
 import random
+import os
 
 from conf_publisher.confluence import Page
 from conf_publisher.publish import Publisher
@@ -57,7 +58,8 @@ def test_attachment_publish(self):
         page.title = 'Title'
         page.body = 'Body'
 
-        data_provider = SphinxFJsonDataProvider(base_dir=config.base_dir)
+        tests_root = os.path.dirname(os.path.abspath(__file__))
+        data_provider = SphinxFJsonDataProvider(root_dir=tests_root, base_dir=config.base_dir)
         page_manager = FakePagePublisher([page])
         attachment_manager = FakeAttachmentPublisher()
         publisher = Publisher(config, data_provider, page_manager, attachment_manager)

tox.ini

@@ -0,0 +1,11 @@
+[tox]
+envlist =
+    {py27,py33,py34,py35}
+    {py27,py33,py34,py35}-lxml
+
+[testenv]
+commands = nosetests ./tests/ {posargs}
+deps =
+    lxml: lxml
+    nose
+    coverage