From 76e37aae4735a82ee488383cdf9dff921b7896e7 Mon Sep 17 00:00:00 2001
From: PyvesB <pierre-yves.bigourdan@bbc.co.uk>
Date: Wed, 17 Jul 2019 09:24:38 +0100
Subject: [PATCH 01/16] Switch to absolute imports and update PyXB command
 accordingly

---
 Makefile                         | 4 ++--
 ebu_tt_live/bindings/_ebuttdt.py | 4 ++--
 ebu_tt_live/bindings/_ebuttlm.py | 6 +++---
 ebu_tt_live/bindings/_ebuttm.py  | 2 +-
 ebu_tt_live/bindings/_ebuttp.py  | 2 +-
 ebu_tt_live/bindings/_ebutts.py  | 2 +-
 ebu_tt_live/bindings/_ttm.py     | 2 +-
 ebu_tt_live/bindings/_ttp.py     | 2 +-
 ebu_tt_live/bindings/_tts.py     | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 2eca73d96..86ace226c 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ all: init ui
 	
 init:
 	pip install --upgrade -r requirements.txt
-	pyxbgen --binding-root=./ebu_tt_live/bindings -m __init__ --schema-root=./ebu_tt_live/xsd/ -r -u ebutt_all.xsd
+	pyxbgen --binding-root=. -m __init__ --schema-root=./ebu_tt_live/xsd/ -r -u ebutt_all.xsd --module-prefix=ebu_tt_live.bindings
 
 initnpm:
 ifeq ("$(wildcard node_modules)","")
@@ -20,7 +20,7 @@ docs:
 	python setup.py build_sphinx
 
 bindings:
-	pyxbgen --binding-root=./ebu_tt_live/bindings -m __init__ --schema-root=./ebu_tt_live/xsd/ -r -u ebutt_all.xsd
+	pyxbgen --binding-root=. -m __init__ --schema-root=./ebu_tt_live/xsd/ -r -u ebutt_all.xsd --module-prefix=ebu_tt_live.bindings
 
 ui: uiclean uibuild
 	
diff --git a/ebu_tt_live/bindings/_ebuttdt.py b/ebu_tt_live/bindings/_ebuttdt.py
index 82d4dfb8b..e5aced3ce 100644
--- a/ebu_tt_live/bindings/_ebuttdt.py
+++ b/ebu_tt_live/bindings/_ebuttdt.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-from raw._ebuttdt import *
-from raw import _ebuttdt as ebuttdt_raw
+from ebu_tt_live.bindings.raw._ebuttdt import *
+from ebu_tt_live.bindings.raw import _ebuttdt as ebuttdt_raw
 from datetime import timedelta
 from decimal import Decimal
 import re, logging
diff --git a/ebu_tt_live/bindings/_ebuttlm.py b/ebu_tt_live/bindings/_ebuttlm.py
index 66ec2d8b1..529382da7 100644
--- a/ebu_tt_live/bindings/_ebuttlm.py
+++ b/ebu_tt_live/bindings/_ebuttlm.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
-from raw._ebuttlm import *
-from raw import _ebuttlm as raw
-from raw import _ebuttp as ebuttp
+from ebu_tt_live.bindings.raw._ebuttlm import *
+from ebu_tt_live.bindings.raw import _ebuttlm as raw
+from ebu_tt_live.bindings.raw import _ebuttp as ebuttp
 from pyxb.utils.domutils import BindingDOMSupport
 
 
diff --git a/ebu_tt_live/bindings/_ebuttm.py b/ebu_tt_live/bindings/_ebuttm.py
index 095d403ea..1c3d9bffc 100644
--- a/ebu_tt_live/bindings/_ebuttm.py
+++ b/ebu_tt_live/bindings/_ebuttm.py
@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-from raw._ebuttm import *
+from ebu_tt_live.bindings.raw._ebuttm import *
diff --git a/ebu_tt_live/bindings/_ebuttp.py b/ebu_tt_live/bindings/_ebuttp.py
index 891cf0c53..1fe1c1c60 100644
--- a/ebu_tt_live/bindings/_ebuttp.py
+++ b/ebu_tt_live/bindings/_ebuttp.py
@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-from raw._ebuttp import *
+from ebu_tt_live.bindings.raw._ebuttp import *
diff --git a/ebu_tt_live/bindings/_ebutts.py b/ebu_tt_live/bindings/_ebutts.py
index 791501641..73494fc51 100644
--- a/ebu_tt_live/bindings/_ebutts.py
+++ b/ebu_tt_live/bindings/_ebutts.py
@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-from raw._ebutts import *
+from ebu_tt_live.bindings.raw._ebutts import *
diff --git a/ebu_tt_live/bindings/_ttm.py b/ebu_tt_live/bindings/_ttm.py
index 5a4e38dcc..8c5347a94 100644
--- a/ebu_tt_live/bindings/_ttm.py
+++ b/ebu_tt_live/bindings/_ttm.py
@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-from raw._ttm import *
+from ebu_tt_live.bindings.raw._ttm import *
diff --git a/ebu_tt_live/bindings/_ttp.py b/ebu_tt_live/bindings/_ttp.py
index 0d10a8339..c238a031f 100644
--- a/ebu_tt_live/bindings/_ttp.py
+++ b/ebu_tt_live/bindings/_ttp.py
@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-from raw._ttp import *
+from ebu_tt_live.bindings.raw._ttp import *
diff --git a/ebu_tt_live/bindings/_tts.py b/ebu_tt_live/bindings/_tts.py
index 1e93d1080..8cd7e2c0c 100644
--- a/ebu_tt_live/bindings/_tts.py
+++ b/ebu_tt_live/bindings/_tts.py
@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-from raw._tts import *
+from ebu_tt_live.bindings.raw._tts import *

From d8213a82f11cb5020df2bf9e21cf99cf021b9b56 Mon Sep 17 00:00:00 2001
From: PyvesB <pierre-yves.bigourdan@bbc.co.uk>
Date: Wed, 17 Jul 2019 09:27:22 +0100
Subject: [PATCH 02/16] Replace usage of reserved async keyword

---
 ebu_tt_live/test/test_utils.py | 2 +-
 ebu_tt_live/utils.py           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ebu_tt_live/test/test_utils.py b/ebu_tt_live/test/test_utils.py
index d583430ce..5c8dc6aea 100644
--- a/ebu_tt_live/test/test_utils.py
+++ b/ebu_tt_live/test/test_utils.py
@@ -75,7 +75,7 @@ class TestRotatingFileBufferSync(RFBCommon):
 
     def setUp(self):
         super(TestRotatingFileBufferSync, self).setUp()
-        self.instance = RotatingFileBuffer(maxlen=3, async=False)
+        self.instance = RotatingFileBuffer(maxlen=3, asynchronous=False)
 
     def test_one_file(self):
         file1 = self._create_a_file(1)
diff --git a/ebu_tt_live/utils.py b/ebu_tt_live/utils.py
index 000598249..0ef4a0ec7 100644
--- a/ebu_tt_live/utils.py
+++ b/ebu_tt_live/utils.py
@@ -114,12 +114,12 @@ class RotatingFileBuffer(RingBufferWithCallback):
     _deletion_thread = None
     _deletion_queue = None
 
-    def __init__(self, maxlen, async=True):
+    def __init__(self, maxlen, asynchronous=True):
         super(RotatingFileBuffer, self).__init__(maxlen=maxlen, callback=self.delete_file)
         # In this case threads make sense since it is I/O we are going to be waiting for and that is releasing the GIL.
         # Deletion is the means for us to send down files for deletion to the other thread(maybe process later)....
         self._deletion_queue = Queue.Queue()
-        if async is True:
+        if asynchronous is True:
             self._deletion_thread = StoppableThread(
                 target=self._delete_thread_loop,
                 kwargs={'q': self._deletion_queue}

From be57ec4d18c02ca8389ea25987181da7e638ab85 Mon Sep 17 00:00:00 2001
From: PyvesB <pierre-yves.bigourdan@bbc.co.uk>
Date: Wed, 17 Jul 2019 09:31:31 +0100
Subject: [PATCH 03/16] Run 2to3 utility

---
 docs/source/conf.py                           | 18 ++++----
 ebu_tt_live/adapters/base.py                  |  8 ++--
 .../test/test_document_data_adapters.py       |  2 +-
 ebu_tt_live/bindings/__init__.py              |  6 +--
 ebu_tt_live/bindings/_ebuttdt.py              | 10 +----
 .../bindings/converters/ebutt3_ebuttd.py      |  2 +-
 ebu_tt_live/bindings/test/test_sizing.py      | 44 +++++++++----------
 ebu_tt_live/bindings/validation/content.py    |  8 ++--
 ebu_tt_live/bindings/validation/timing.py     | 10 ++---
 ebu_tt_live/carriage/interface.py             |  3 +-
 .../carriage/test/test_base_carriage.py       | 12 ++---
 ebu_tt_live/config/adapters.py                |  2 +-
 ebu_tt_live/config/carriage.py                |  4 +-
 ebu_tt_live/config/common.py                  |  6 +--
 ebu_tt_live/documents/ebutt3.py               | 12 ++---
 ...st_deduplicationReplaceStylesAndRegions.py |  2 +-
 .../documents/test/test_memory_profile.py     |  4 +-
 ebu_tt_live/node/base.py                      |  2 +-
 ebu_tt_live/node/deduplicator.py              | 10 ++---
 ebu_tt_live/node/interface.py                 |  3 +-
 ebu_tt_live/node/producer.py                  |  2 +-
 ebu_tt_live/node/test/test_distributing.py    |  2 +-
 ebu_tt_live/scripts/ebu_dummy_encoder.py      |  4 +-
 ebu_tt_live/scripts/ebu_interactive_shell.py  |  2 +-
 ebu_tt_live/scripts/ebu_simple_producer.py    |  2 +-
 ebu_tt_live/scripts/test/test_scripts.py      |  2 +-
 ebu_tt_live/twisted/__init__.py               |  2 +-
 .../twisted/test/test_twisted_websocket.py    | 42 +++++++++---------
 ebu_tt_live/twisted/websocket.py              |  2 +-
 ebu_tt_live/utils.py                          | 14 +++---
 testing/bdd/test_handover.py                  |  2 +-
 testing/bdd/test_segmentation.py              |  4 +-
 testing/test_integration.py                   |  2 +-
 33 files changed, 119 insertions(+), 131 deletions(-)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 63747f37c..c58084f83 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -68,18 +68,18 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'EBU-TT-Live Toolkit'
-copyright = u'2017, European Broadcasting Union'
-author = u'European Broadcasting Union'
+project = 'EBU-TT-Live Toolkit'
+copyright = '2017, European Broadcasting Union'
+author = 'European Broadcasting Union'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = u'2.1.1'
+version = '2.1.1'
 # The full version, including alpha/beta/rc tags.
-release = u'2.1.1'
+release = '2.1.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -279,8 +279,8 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'EBU-TT-LiveToolkit.tex', u'EBU-TT-Live Toolkit Documentation',
-     u'European Broadcasting Union', 'manual'),
+    (master_doc, 'EBU-TT-LiveToolkit.tex', 'EBU-TT-Live Toolkit Documentation',
+     'European Broadcasting Union', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -315,7 +315,7 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'ebu-tt-livetoolkit', u'EBU-TT-Live Toolkit Documentation',
+    (master_doc, 'ebu-tt-livetoolkit', 'EBU-TT-Live Toolkit Documentation',
      [author], 1)
 ]
 
@@ -330,7 +330,7 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'EBU-TT-LiveToolkit', u'EBU-TT-Live Toolkit Documentation',
+    (master_doc, 'EBU-TT-LiveToolkit', 'EBU-TT-Live Toolkit Documentation',
      author, 'EBU-TT-LiveToolkit', 'One line description of project.',
      'Miscellaneous'),
 ]
diff --git a/ebu_tt_live/adapters/base.py b/ebu_tt_live/adapters/base.py
index 8e28b6336..0baf24164 100644
--- a/ebu_tt_live/adapters/base.py
+++ b/ebu_tt_live/adapters/base.py
@@ -9,11 +9,10 @@
 # ==========
 
 
-class IDocumentDataAdapter(object):
+class IDocumentDataAdapter(object, metaclass=AutoRegisteringABCMeta):
     """
     This adapter is used to do various conversions on the payload between the carriage and the node
     """
-    __metaclass__ = AutoRegisteringABCMeta
 
     __impl_registry = {}
     _expects = AbstractStaticMember(validate_types_only)
@@ -24,7 +23,7 @@ def auto_register_impl(cls, impl_class):
         impl_expects = impl_class.expects()
         provides_map = cls.__impl_registry.setdefault(impl_expects, weakref.WeakValueDictionary())
         impl_provides = impl_class.provides()
-        if impl_provides in provides_map.keys():
+        if impl_provides in list(provides_map.keys()):
             log.warning(
                 '({} -> {}) adapter already registered: {}. Ignoring: {} '.format(
                     impl_expects,
@@ -83,14 +82,13 @@ def convert_data(self, data, **kwargs):
         raise NotImplementedError()
 
 
-class INodeCarriageAdapter(object):
+class INodeCarriageAdapter(object, metaclass=AutoRegisteringABCMeta):
     """
     This adapter wraps the DocumentDataAdapter conversion logic and shows a dual interface. It responsibility is
     to facilitate direct communication between incompatible carriage mechanisms and processing nodes.
     This is a tricky business because this class does not have a hardcoded expects-provides interface contract.
     It works it out as it goes forward from the parameters.
     """
-    __metaclass__ = AutoRegisteringABCMeta
 
     @abstractproperty
     def data_adapters(self):
diff --git a/ebu_tt_live/adapters/test/test_document_data_adapters.py b/ebu_tt_live/adapters/test/test_document_data_adapters.py
index b98601e45..d3b593bb8 100644
--- a/ebu_tt_live/adapters/test/test_document_data_adapters.py
+++ b/ebu_tt_live/adapters/test/test_document_data_adapters.py
@@ -91,7 +91,7 @@ def _assert_output_type(self, result):
         self.assertIsInstance(result, self._output_type)
 
     def _assert_kwargs_passtrough(self, result_kwargs, expected_keys):
-        self.assertEquals(set(result_kwargs.keys()), set(expected_keys))
+        self.assertEqual(set(result_kwargs.keys()), set(expected_keys))
 
     def _get_xml(self):
         with open(self._test_xml_path, 'r') as xml_file:
diff --git a/ebu_tt_live/bindings/__init__.py b/ebu_tt_live/bindings/__init__.py
index 4b1eb4347..379e270a2 100644
--- a/ebu_tt_live/bindings/__init__.py
+++ b/ebu_tt_live/bindings/__init__.py
@@ -101,7 +101,7 @@ class style_type(StyledElementMixin, IDMixin, SizingValidationMixin, SemanticVal
     _default_attrs = None
 
     def __repr__(self):
-        return u'<style ID: {id} at {addr}>'.format(
+        return '<style ID: {id} at {addr}>'.format(
             id=self.id,
             addr=hex(id(self))
         )
@@ -384,7 +384,7 @@ def compute_style(cls, specified_style, parent_computed_style, region_computed_s
         else:
             computed.lineHeight = computed_line_height
 
-        for attr_name in cls._simple_attr_defaults.keys():
+        for attr_name in list(cls._simple_attr_defaults.keys()):
             comp_attr_value = cls.compute_simple_attribute(
                 attr_name=attr_name,
                 specified_style=specified_style
@@ -398,7 +398,7 @@ def compute_style(cls, specified_style, parent_computed_style, region_computed_s
                     comp_attr_value
                 )
 
-        for attr_name in cls._inherited_attr_defaults.keys():
+        for attr_name in list(cls._inherited_attr_defaults.keys()):
             comp_attr_value = cls.compute_inherited_attribute(
                 attr_name=attr_name,
                 specified_style=specified_style,
diff --git a/ebu_tt_live/bindings/_ebuttdt.py b/ebu_tt_live/bindings/_ebuttdt.py
index e5aced3ce..acbbc8c19 100644
--- a/ebu_tt_live/bindings/_ebuttdt.py
+++ b/ebu_tt_live/bindings/_ebuttdt.py
@@ -319,10 +319,7 @@ def as_timedelta(cls, instance):
         :param instance:
         :return:
         """
-        hours, minutes, seconds, milliseconds = map(
-            lambda x: cls._int_or_none(x),
-            cls._groups_regex.match(instance).groups()
-        )
+        hours, minutes, seconds, milliseconds = [cls._int_or_none(x) for x in cls._groups_regex.match(instance).groups()]
         return timedelta(hours=hours, minutes=minutes, seconds=seconds, milliseconds=milliseconds)
 
     @classmethod
@@ -370,10 +367,7 @@ def as_timedelta(cls, instance):
         :param instance:
         :return:
         """
-        hours, minutes, seconds, milliseconds = map(
-            lambda x: cls._int_or_none(x),
-            cls._groups_regex.match(instance).groups()
-        )
+        hours, minutes, seconds, milliseconds = [cls._int_or_none(x) for x in cls._groups_regex.match(instance).groups()]
         return timedelta(hours=hours, minutes=minutes, seconds=seconds, milliseconds=milliseconds)
 
     @classmethod
diff --git a/ebu_tt_live/bindings/converters/ebutt3_ebuttd.py b/ebu_tt_live/bindings/converters/ebutt3_ebuttd.py
index 39bfabc90..85ff63474 100644
--- a/ebu_tt_live/bindings/converters/ebutt3_ebuttd.py
+++ b/ebu_tt_live/bindings/converters/ebutt3_ebuttd.py
@@ -125,7 +125,7 @@ def _link_adjusted_fonts_styling(self, adjusted_fonts, root_element):
             root_element.head = d_head_type()
         if root_element.head.styling is None:
             root_element.head.styling = d_styling_type()
-        root_element.head.styling.style.extend(adjusted_fonts.values())
+        root_element.head.styling.style.extend(list(adjusted_fonts.values()))
 
     def convert_tt(self, tt_in, dataset):
         dataset['timeBase'] = tt_in.timeBase
diff --git a/ebu_tt_live/bindings/test/test_sizing.py b/ebu_tt_live/bindings/test/test_sizing.py
index 611d4410c..f6c1ee70b 100644
--- a/ebu_tt_live/bindings/test/test_sizing.py
+++ b/ebu_tt_live/bindings/test/test_sizing.py
@@ -7,53 +7,53 @@
 
 class TestPixelFontSizeType(TestCase):
 
-    _test_string_1 = u'10px'
-    _test_string_2 = u'10px 20px'
+    _test_string_1 = '10px'
+    _test_string_2 = '10px 20px'
     _type_class = ebuttdt.PixelFontSizeType
 
     def test_simple_1dim(self):
         test_instance = self._type_class(self._test_string_1)
         self.assertIsNone(test_instance.horizontal)
-        self.assertEquals(test_instance.vertical, 10.0)
+        self.assertEqual(test_instance.vertical, 10.0)
         assert test_instance == self._test_string_1
 
     def test_simple_2dim(self):
         test_instance = self._type_class(self._test_string_2)
-        self.assertEquals(test_instance.horizontal, 10.0)
-        self.assertEquals(test_instance.vertical, 20.0)
+        self.assertEqual(test_instance.horizontal, 10.0)
+        self.assertEqual(test_instance.vertical, 20.0)
         assert test_instance == self._test_string_2
 
     def test_instantiate_1dim(self):
         test_instance = self._type_class(10)
         self.assertIsNone(test_instance.horizontal)
-        self.assertEquals(test_instance.vertical, 10.0)
+        self.assertEqual(test_instance.vertical, 10.0)
         assert test_instance == self._test_string_1
 
     def test_instantiate_2dim(self):
         test_instance = self._type_class(10, 20)
-        self.assertEquals(test_instance.horizontal, 10.0)
-        self.assertEquals(test_instance.vertical, 20.0)
+        self.assertEqual(test_instance.horizontal, 10.0)
+        self.assertEqual(test_instance.vertical, 20.0)
         assert test_instance == self._test_string_2
 
 
 class TestCellFontSizeType(TestPixelFontSizeType):
 
-    _test_string_1 = u'10c'
-    _test_string_2 = u'10c 20c'
+    _test_string_1 = '10c'
+    _test_string_2 = '10c 20c'
     _type_class = ebuttdt.CellFontSizeType
 
 
 class TestPercentageFontSizeType(TestPixelFontSizeType):
 
-    _test_string_1 = u'10%'
-    _test_string_2 = u'10% 20%'
+    _test_string_1 = '10%'
+    _test_string_2 = '10% 20%'
     _type_class = ebuttdt.PercentageFontSizeType
 
 
 class TestPixelOriginType(TestCase):
 
-    _test_string_1 = u'10px'
-    _test_string_2 = u'20px 10px'
+    _test_string_1 = '10px'
+    _test_string_2 = '20px 10px'
     _type_class = ebuttdt.PixelOriginType
 
     def test_simple_1dim(self):
@@ -61,8 +61,8 @@ def test_simple_1dim(self):
 
     def test_simple_2dim(self):
         instance = self._type_class(self._test_string_2)
-        self.assertEquals(instance.horizontal, 20.0)
-        self.assertEquals(instance.vertical, 10.0)
+        self.assertEqual(instance.horizontal, 20.0)
+        self.assertEqual(instance.vertical, 10.0)
         assert instance == self._test_string_2
 
     def test_instantiate_1dim(self):
@@ -70,20 +70,20 @@ def test_instantiate_1dim(self):
 
     def test_instantiate_2dim(self):
         instance = self._type_class(20, 10)
-        self.assertEquals(instance.horizontal, 20.0)
-        self.assertEquals(instance.vertical, 10.0)
+        self.assertEqual(instance.horizontal, 20.0)
+        self.assertEqual(instance.vertical, 10.0)
         assert instance == self._test_string_2
 
 
 class TestCellOriginType(TestPixelOriginType):
 
-    _test_string_1 = u'10c'
-    _test_string_2 = u'20c 10c'
+    _test_string_1 = '10c'
+    _test_string_2 = '20c 10c'
     _type_class = ebuttdt.CellOriginType
 
 
 class TestPercentageOriginType(TestPixelOriginType):
 
-    _test_string_1 = u'10%'
-    _test_string_2 = u'20% 10%'
+    _test_string_1 = '10%'
+    _test_string_2 = '20% 10%'
     _type_class = ebuttdt.PercentageOriginType
diff --git a/ebu_tt_live/bindings/validation/content.py b/ebu_tt_live/bindings/validation/content.py
index 8ab3a5549..f5133f5a3 100644
--- a/ebu_tt_live/bindings/validation/content.py
+++ b/ebu_tt_live/bindings/validation/content.py
@@ -47,7 +47,7 @@ def content_to_string(self, begin=None, end=None):
         if end is not None:
             if end <= self.computed_begin_time:
                 str_lines.append(
-                    u'{} Timings: [({} - {})({} -{})(discarded)]'.format(
+                    '{} Timings: [({} - {})({} -{})(discarded)]'.format(
                         self.__class__.__name__,
                         self.begin,
                         self.end,
@@ -63,7 +63,7 @@ def content_to_string(self, begin=None, end=None):
                 else:
                     res_end_time = self.computed_end_time
                 str_lines.append(
-                    u'{} Timings: [({} - {})({} - {})({} - {})]'.format(
+                    '{} Timings: [({} - {})({} - {})({} - {})]'.format(
                         self.__class__.__name__,
                         self.begin,
                         self.end,
@@ -75,8 +75,8 @@ def content_to_string(self, begin=None, end=None):
                 )
         for item in self.orderedContent():
             if isinstance(item, NonElementContent):
-                str_lines.append(u'{}'.format(item.value))
+                str_lines.append('{}'.format(item.value))
             else:
                 str_lines.append(item.value.content_to_string(begin=begin, end=end))
 
-        return u'\n'.join(str_lines)
+        return '\n'.join(str_lines)
diff --git a/ebu_tt_live/bindings/validation/timing.py b/ebu_tt_live/bindings/validation/timing.py
index a9665549a..5f4a31bf1 100644
--- a/ebu_tt_live/bindings/validation/timing.py
+++ b/ebu_tt_live/bindings/validation/timing.py
@@ -183,9 +183,8 @@ def _semantic_postprocess_timing(self, dataset, element_content):
             # All timing containers are complexTypes so we can call orderedContent safely
             # but we don't want to bother with explicitly badly timed elements so filter
             # them out.
-            children = filter(lambda item: isinstance(item, TimingValidationMixin) \
-                              and not item._element_badly_timed(value=None, element=item), \
-                              [x.value for x in self.orderedContent()])
+            children = [item for item in [x.value for x in self.orderedContent()] if isinstance(item, TimingValidationMixin) \
+                              and not item._element_badly_timed(value=None, element=item)]
                               
             # Order of statements is important
             if not children:
@@ -220,9 +219,8 @@ def _semantic_postprocess_timing(self, dataset, element_content):
         if begin_timedelta is None:
 
             if children is None:
-                children = filter(lambda item: isinstance(item, TimingValidationMixin) \
-                                  and not item._element_badly_timed(value=None, element=item),
-                                  [x.value for x in self.orderedContent()])
+                children = [item for item in [x.value for x in self.orderedContent()] if isinstance(item, TimingValidationMixin) \
+                                  and not item._element_badly_timed(value=None, element=item)]
 
             self._post_calculate_begin(children=children)
 
diff --git a/ebu_tt_live/carriage/interface.py b/ebu_tt_live/carriage/interface.py
index 017d54aa5..c445fd834 100644
--- a/ebu_tt_live/carriage/interface.py
+++ b/ebu_tt_live/carriage/interface.py
@@ -5,11 +5,10 @@
 # ==========
 
 
-class ICarriageMechanism(object):
+class ICarriageMechanism(object, metaclass=AutoRegisteringABCMeta):
     """
     Basic interface for the carrige mechanisms
     """
-    __metaclass__ = AutoRegisteringABCMeta
 
 
 class IProducerCarriage(ICarriageMechanism):
diff --git a/ebu_tt_live/carriage/test/test_base_carriage.py b/ebu_tt_live/carriage/test/test_base_carriage.py
index b38424329..fdb1d48e8 100644
--- a/ebu_tt_live/carriage/test/test_base_carriage.py
+++ b/ebu_tt_live/carriage/test/test_base_carriage.py
@@ -81,7 +81,7 @@ def on_new_data(self, data, **kwargs):
     def test_dummy_producer_success(self):
         producer_carriage = self._get_dummy_producer_carriage(DummyDataTypeA)
         producer_carriage.register_producer_node(self._producer_node)
-        self.assertEquals(producer_carriage.producer_node, self._producer_node)
+        self.assertEqual(producer_carriage.producer_node, self._producer_node)
 
     def test_dummy_producer_incompatible_interface(self):
         producer_carriage = self._get_dummy_producer_carriage(DummyDataTypeA)
@@ -96,7 +96,7 @@ def test_dummy_producer_incompatible_data(self):
     def test_dummy_consumer_success(self):
         consumer_carriage = self._get_dummy_consumer_carriage(DummyDataTypeA)
         consumer_carriage.register_consumer_node(self._consumer_node)
-        self.assertEquals(consumer_carriage.consumer_node, self._consumer_node)
+        self.assertEqual(consumer_carriage.consumer_node, self._consumer_node)
 
     def test_dummy_consumer_incompatible_interface(self):
         consumer_carriage = self._get_dummy_consumer_carriage(DummyDataTypeA)
@@ -111,19 +111,19 @@ def test_dummy_consumer_incompatible_data(self):
     def test_dummy_combined_success_with_producer(self):
         combined_carriage = self._get_dummy_combined_carriage(expects=DummyDataTypeA, provides=DummyDataTypeA)
         combined_carriage.register_producer_node(self._producer_node)
-        self.assertEquals(combined_carriage.producer_node, self._producer_node)
+        self.assertEqual(combined_carriage.producer_node, self._producer_node)
 
     def test_dummy_combined_success_with_consumer(self):
         combined_carriage = self._get_dummy_combined_carriage(expects=DummyDataTypeA, provides=DummyDataTypeA)
         combined_carriage.register_consumer_node(self._consumer_node)
-        self.assertEquals(combined_carriage.consumer_node, self._consumer_node)
+        self.assertEqual(combined_carriage.consumer_node, self._consumer_node)
 
     def test_dummy_combined_success_with_both(self):
         combined_carriage = self._get_dummy_combined_carriage(expects=DummyDataTypeA, provides=DummyDataTypeA)
         combined_carriage.register_producer_node(self._producer_node)
         combined_carriage.register_consumer_node(self._consumer_node)
-        self.assertEquals(combined_carriage.producer_node, self._producer_node)
-        self.assertEquals(combined_carriage.consumer_node, self._consumer_node)
+        self.assertEqual(combined_carriage.producer_node, self._producer_node)
+        self.assertEqual(combined_carriage.consumer_node, self._consumer_node)
 
     def test_dummy_combined_incompatible_interface_with_consumer(self):
         combined_carriage = self._get_dummy_combined_carriage(expects=DummyDataTypeA, provides=DummyDataTypeA)
diff --git a/ebu_tt_live/config/adapters.py b/ebu_tt_live/config/adapters.py
index 0ededb1e6..f171f443b 100644
--- a/ebu_tt_live/config/adapters.py
+++ b/ebu_tt_live/config/adapters.py
@@ -17,7 +17,7 @@ def parse_adapter_list(value):
     if value is not None:
         for item in value:
             conv_type = item['type']
-            kwargs = {ckey: carg for ckey, carg in item.items() if ckey != 'type'}
+            kwargs = {ckey: carg for ckey, carg in list(item.items()) if ckey != 'type'}
             parsed_value.append(data_adapters_by_directed_conversion.get(conv_type)(**kwargs))
     return parsed_value or None
 
diff --git a/ebu_tt_live/config/carriage.py b/ebu_tt_live/config/carriage.py
index b1f0f1624..8451853f8 100644
--- a/ebu_tt_live/config/carriage.py
+++ b/ebu_tt_live/config/carriage.py
@@ -6,7 +6,7 @@
 from ebu_tt_live.strings import ERR_CONF_PROXY_CONF_VALUE, ERR_NO_SUCH_COMPONENT
 from ebu_tt_live.errors import ConfigurationError
 from ebu_tt_live.strings import CFG_FILENAME_PATTERN, CFG_MESSAGE_PATTERN
-import urlparse
+import urllib.parse
 import re
 
 # Memory carriage mechanism configurators
@@ -115,7 +115,7 @@ def start(self):
 # Websocket carriage mechanism configurators
 # ==========================================
 def str_to_url_converter(value):
-    parsed = urlparse.urlparse(value)
+    parsed = urllib.parse.urlparse(value)
     return parsed
 
 
diff --git a/ebu_tt_live/config/common.py b/ebu_tt_live/config/common.py
index 1106ac078..afe05a729 100644
--- a/ebu_tt_live/config/common.py
+++ b/ebu_tt_live/config/common.py
@@ -6,7 +6,7 @@
 from ebu_tt_live.strings import ERR_CONF_ONE_BACKEND_ONLY
 from ebu_tt_live.errors import ConfigurationError
 
-runtime_template_regex = re.compile(ur'[*]{2}.*?[*]{2}')
+runtime_template_regex = re.compile(r'[*]{2}.*?[*]{2}')
 converters = converters
 
 log = logging.getLogger(__name__)
@@ -55,8 +55,8 @@ def configure_component(cls, config, local_config, **kwargs):
     @classmethod
     def _resolve_runtime_variable_match(cls, matchobj):
         # Give this function to re.sub to do the replacement for you
-        var_loc = matchobj.group(0).replace(u'**', u'')
-        var_loc = var_loc.split(u'.')
+        var_loc = matchobj.group(0).replace('**', '')
+        var_loc = var_loc.split('.')
         node_id, attr_names = var_loc[0], var_loc[1:]
         node = current_app.get_node(node_id)
         result = node
diff --git a/ebu_tt_live/documents/ebutt3.py b/ebu_tt_live/documents/ebutt3.py
index 9ac8243d8..59769c013 100644
--- a/ebu_tt_live/documents/ebutt3.py
+++ b/ebu_tt_live/documents/ebutt3.py
@@ -424,7 +424,7 @@ def discard_document(self, resolved_end_time, verbose=False):
         self._resolved_begin_time = self.computed_begin_time
         if verbose:
             document_logger.info(
-                u'Document discarded:\n{}'.format(
+                'Document discarded:\n{}'.format(
                     self.content_to_string(end=resolved_end_time)
                 )
             )
@@ -479,7 +479,7 @@ def content_to_string(self, begin=None, end=None):
                 )
             )
 
-        return u'\n'.join(str_lines)
+        return '\n'.join(str_lines)
 
     def validate(self):
         # Reset timeline
@@ -803,7 +803,7 @@ def _insert_or_discard(self, document):
             self.timeline.add(ends_after)
             if self._verbose:
                 document_logger.info(
-                    u'Document trimmed by next one:\n{}'.format(
+                    'Document trimmed by next one:\n{}'.format(
                         begins_before.element.content_to_string()
                     )
                 )
@@ -833,7 +833,7 @@ def _insert_document(self, document, ends=None):
         ))
         if self._verbose:
             document_logger.info(
-                u'New document inserted:\n{}'.format(
+                'New document inserted:\n{}'.format(
                     document.content_to_string()
                 )
             )
@@ -861,7 +861,7 @@ def _override_sequence(self, document):
                 else:
                     discarded_timing_events.setdefault(item.element, []).append(item)
 
-        for item, events in discarded_timing_events.items():
+        for item, events in list(discarded_timing_events.items()):
             item.discard_document(
                 resolved_end_time=resolved_begin.when,
                 verbose=self._verbose
@@ -884,7 +884,7 @@ def discard_before(self, document):
             if item.element != document:
                 discarded_timing_events.setdefault(item.element, []).append(item)
 
-        for item, events in discarded_timing_events.items():
+        for item, events in list(discarded_timing_events.items()):
             item.discard_document(
                 resolved_end_time=discard_time,
                 verbose=self._verbose
diff --git a/ebu_tt_live/documents/test/test_deduplicationReplaceStylesAndRegions.py b/ebu_tt_live/documents/test/test_deduplicationReplaceStylesAndRegions.py
index fbf1c58c1..d89ad612a 100644
--- a/ebu_tt_live/documents/test/test_deduplicationReplaceStylesAndRegions.py
+++ b/ebu_tt_live/documents/test/test_deduplicationReplaceStylesAndRegions.py
@@ -167,4 +167,4 @@ def test_one(self):
 
             document.validate()
 
-            print document.get_xml()
+            print(document.get_xml())
diff --git a/ebu_tt_live/documents/test/test_memory_profile.py b/ebu_tt_live/documents/test/test_memory_profile.py
index 6edef3409..a3af66470 100644
--- a/ebu_tt_live/documents/test/test_memory_profile.py
+++ b/ebu_tt_live/documents/test/test_memory_profile.py
@@ -99,7 +99,7 @@ def test_many_documents_removed(self):
         doc_reserve = []
         doc_refs = []
 
-        for number in xrange(1, 10):
+        for number in range(1, 10):
             doc = self._generate_document(
                 sequence_number=number,
                 offset=timedelta(seconds=5*number)
@@ -128,7 +128,7 @@ def test_documents_in_sequence(self):
         sequence.add_document(doc1)
         seq_ref = weakref.ref(sequence)
         del doc1
-        for number in xrange(2, 10):
+        for number in range(2, 10):
             doc = self._generate_document(
                 sequence_number=number,
                 offset=timedelta(seconds=5*number)
diff --git a/ebu_tt_live/node/base.py b/ebu_tt_live/node/base.py
index 80835b2dd..4c81d28a6 100644
--- a/ebu_tt_live/node/base.py
+++ b/ebu_tt_live/node/base.py
@@ -104,7 +104,7 @@ def check_if_document_seen(self, document=None, sequence_identifier=None, sequen
         if sequence_identifier is None or sequence_number is None:
             raise Exception()
 
-        if sequence_identifier in self._seen_docs.keys():
+        if sequence_identifier in list(self._seen_docs.keys()):
             if sequence_number in self._seen_docs[sequence_identifier]:
                 return False
 
diff --git a/ebu_tt_live/node/deduplicator.py b/ebu_tt_live/node/deduplicator.py
index e58364aeb..522aa017b 100644
--- a/ebu_tt_live/node/deduplicator.py
+++ b/ebu_tt_live/node/deduplicator.py
@@ -55,7 +55,7 @@ def remove_duplication(self, document):
 
         if document.binding.head.styling is not None:
             styles = document.binding.head.styling.style
-            print styles
+            print(styles)
             document.binding.head.styling.style = None
 
             self.CollateUniqueVals(styles, old_id_dict, new_id_dict, hash_dict)
@@ -104,7 +104,7 @@ def AppendNewElements(self, element_list, element_to_append_to, old_id_dict, \
         Replaces starting style and region elements with the unique ones identified in
         CollateUniqueVals
         """
-        for hash_val, new_id in hash_dict.iteritems():
+        for hash_val, new_id in hash_dict.items():
 
             for old_element in element_list:
                 if old_element.id is new_id.id:
@@ -137,14 +137,14 @@ def __init__(self, value):
 
         # sorted to make sure that for two elements with the same set of
         # attributes the values are put into the hash string in the same order
-        sortedDict = sorted(attributeDict.items(), key=lambda t: t[0])
+        sortedDict = sorted(list(attributeDict.items()), key=lambda t: t[0])
 
-        concatenatedStyleString = u''
+        concatenatedStyleString = ''
         for key,val in sortedDict:
             styleValue = ReplaceNone(val.value(value))
             concatenatedStyleString += str(styleValue) + '%'
 
-        for key,val in value.wildcardAttributeMap().items():
+        for key,val in list(value.wildcardAttributeMap().items()):
             namespace = ReplaceNone(key.namespaceURI())
             localName = key.localName()
             wildcardValue = ReplaceNone(val)
diff --git a/ebu_tt_live/node/interface.py b/ebu_tt_live/node/interface.py
index 2a3817bbf..167b392a8 100644
--- a/ebu_tt_live/node/interface.py
+++ b/ebu_tt_live/node/interface.py
@@ -5,14 +5,13 @@
 # ==========
 
 
-class INode(object):
+class INode(object, metaclass=AutoRegisteringABCMeta):
     """
     This is the foundation of all nodes that take part in the processing of subtitle documents.
     The Node should deal with subtitles in a high level interface,
     which is an instance of :class:`<ebu_tt_live.documents.SubtitleDocument>`. That is the interface which should
     be used to communicate with the carriage mechanism. See :class:`<ebu_tt_live.carriage.ICarriageMechanism>`
     """
-    __metaclass__ = AutoRegisteringABCMeta
 
     @abstractmethod
     def process_document(self, document, **kwargs):
diff --git a/ebu_tt_live/node/producer.py b/ebu_tt_live/node/producer.py
index 56e8a3b68..cd5bc4c9c 100644
--- a/ebu_tt_live/node/producer.py
+++ b/ebu_tt_live/node/producer.py
@@ -64,7 +64,7 @@ def process_document(self, document=None, **kwargs):
 
         if self._input_blocks:
             try:
-                lines = self._input_blocks.next()
+                lines = next(self._input_blocks)
             except StopIteration:
                 raise EndOfData(END_OF_DATA)
         else:
diff --git a/ebu_tt_live/node/test/test_distributing.py b/ebu_tt_live/node/test/test_distributing.py
index 036103727..45d135fb6 100644
--- a/ebu_tt_live/node/test/test_distributing.py
+++ b/ebu_tt_live/node/test/test_distributing.py
@@ -46,7 +46,7 @@ def test_process_document_raw_xml(self):
 
     def test_check_document_buffer_overflow(self):
         seq_id = 'testSequence01'
-        for item in xrange(100):
+        for item in range(100):
             self.distributing_node.check_if_document_seen(
                 sequence_identifier=seq_id,
                 sequence_number=item
diff --git a/ebu_tt_live/scripts/ebu_dummy_encoder.py b/ebu_tt_live/scripts/ebu_dummy_encoder.py
index 50b630d85..7a70fefe1 100644
--- a/ebu_tt_live/scripts/ebu_dummy_encoder.py
+++ b/ebu_tt_live/scripts/ebu_dummy_encoder.py
@@ -102,8 +102,8 @@ def main():
 
     document.validate()
 
-    print(
+    print((
         document.get_xml()
-    )
+    ))
 
     log.info('XML output printed')
diff --git a/ebu_tt_live/scripts/ebu_interactive_shell.py b/ebu_tt_live/scripts/ebu_interactive_shell.py
index a7c719f11..9e8e0e06b 100644
--- a/ebu_tt_live/scripts/ebu_interactive_shell.py
+++ b/ebu_tt_live/scripts/ebu_interactive_shell.py
@@ -1,7 +1,7 @@
 
 import logging
 from argparse import ArgumentParser
-from common import create_loggers
+from .common import create_loggers
 from ebu_tt_live.documents import EBUTT3Document
 
 
diff --git a/ebu_tt_live/scripts/ebu_simple_producer.py b/ebu_tt_live/scripts/ebu_simple_producer.py
index db6803ac9..f3e8bfcdb 100644
--- a/ebu_tt_live/scripts/ebu_simple_producer.py
+++ b/ebu_tt_live/scripts/ebu_simple_producer.py
@@ -90,7 +90,7 @@ def main():
         )
 
         factory = BroadcastServerFactory(
-            url=u"ws://127.0.0.1:9000",
+            url="ws://127.0.0.1:9000",
             producer=twisted_producer
         )
 
diff --git a/ebu_tt_live/scripts/test/test_scripts.py b/ebu_tt_live/scripts/test/test_scripts.py
index c10247160..f84822b7c 100644
--- a/ebu_tt_live/scripts/test/test_scripts.py
+++ b/ebu_tt_live/scripts/test/test_scripts.py
@@ -9,4 +9,4 @@ class TestDummyScript(TestCase):
     def test_simple_run(self):
         process = Popen('ebu-dummy-encoder', stderr=PIPE, stdout=PIPE)
         process.communicate()
-        self.assertEquals(process.returncode, 0)
+        self.assertEqual(process.returncode, 0)
diff --git a/ebu_tt_live/twisted/__init__.py b/ebu_tt_live/twisted/__init__.py
index bd4ea674b..d95950492 100644
--- a/ebu_tt_live/twisted/__init__.py
+++ b/ebu_tt_live/twisted/__init__.py
@@ -1,6 +1,6 @@
 
 from .base import IBroadcaster
-from websocket import BroadcastServerFactory, BroadcastServerProtocol, BroadcastClientFactory, \
+from .websocket import BroadcastServerFactory, BroadcastServerProtocol, BroadcastClientFactory, \
     BroadcastClientProtocol, UserInputServerFactory, UserInputServerProtocol, TwistedWSConsumer, TwistedWSPushProducer, \
     TwistedConsumer, TwistedPullProducer
 from twisted.internet import task
diff --git a/ebu_tt_live/twisted/test/test_twisted_websocket.py b/ebu_tt_live/twisted/test/test_twisted_websocket.py
index c547e84e1..4c18e7753 100644
--- a/ebu_tt_live/twisted/test/test_twisted_websocket.py
+++ b/ebu_tt_live/twisted/test/test_twisted_websocket.py
@@ -44,9 +44,9 @@ def _connect(self):
         self.str.clear()
 
         # At this point handshake is supposed to be done
-        self.assertEquals(self.sproto.state, self.sproto.STATE_OPEN)
+        self.assertEqual(self.sproto.state, self.sproto.STATE_OPEN)
         self.sproto.failHandshake.assert_not_called()
-        self.assertEquals(self.cproto.state, self.cproto.STATE_OPEN)
+        self.assertEqual(self.cproto.state, self.cproto.STATE_OPEN)
         self.cproto.failHandshake.assert_not_called()
 
     def _disconnect(self):
@@ -59,12 +59,12 @@ def _disconnect(self):
 
         # Verify transmission success
         # The server should have closed the socket by now
-        self.assertEquals(self.sproto.state, self.sproto.STATE_CLOSED)
+        self.assertEqual(self.sproto.state, self.sproto.STATE_CLOSED)
         self.assertTrue(self.sproto.wasClean)
         self.assertFalse(self.str.connected)
         # And the client needs some help here
         self.ctr.loseConnection()
-        self.assertEquals(self.cproto.state, self.cproto.STATE_CLOSED)
+        self.assertEqual(self.cproto.state, self.cproto.STATE_CLOSED)
         self.assertTrue(self.cproto.wasClean)
 
 
@@ -91,8 +91,8 @@ def test_server_prod_client_cons_success(self):
 
         self.cons.register.assert_called_with(self.cproto)
         self.prod.register.assert_called_with(self.sproto)
-        self.assertEquals(self.cproto.action, 'subscribe')
-        self.assertEquals(self.sproto.action, 'subscribe')
+        self.assertEqual(self.cproto.action, 'subscribe')
+        self.assertEqual(self.sproto.action, 'subscribe')
 
         # At this point we are supposed to be able to send data through
         doc = 'dummy message'
@@ -143,8 +143,8 @@ def fail_parsing(data, **kwargs):
 
         self.cons.register.assert_called_with(self.cproto)
         self.prod.register.assert_called_with(self.sproto)
-        self.assertEquals(self.cproto.action, 'subscribe')
-        self.assertEquals(self.sproto.action, 'subscribe')
+        self.assertEqual(self.cproto.action, 'subscribe')
+        self.assertEqual(self.sproto.action, 'subscribe')
 
         # At this point we are supposed to be able to send data through
         doc = 'dummy message'
@@ -164,7 +164,7 @@ def fail_parsing(data, **kwargs):
         # Now the exception should be raised and the connection should be broken
 
         self.cons.write.assert_called()
-        self.assertEquals(self.cproto.state, self.sproto.STATE_CLOSED)
+        self.assertEqual(self.cproto.state, self.sproto.STATE_CLOSED)
         self.assertFalse(self.cproto.wasClean)
 
     def test_consumer_send_data_error(self):
@@ -185,7 +185,7 @@ def test_consumer_send_data_error(self):
         self.sproto.dataReceived('consumers should not send data')
 
         # This must have triggered the connection to be dropped
-        self.assertEquals(self.sproto.state, self.sproto.STATE_CLOSED)
+        self.assertEqual(self.sproto.state, self.sproto.STATE_CLOSED)
         self.assertFalse(self.sproto.wasClean)
 
     def test_producer_to_producer_error(self):
@@ -202,7 +202,7 @@ def test_producer_to_producer_error(self):
 
     def test_url_encoded_components(self):
         # This test is about getting percent encoded characters work in sequenceId or hostname
-        sequence_id = u'sequence/ünicödé?/Name'
+        sequence_id = 'sequence/ünicödé?/Name'
         self._create_server(url='ws://localhost:9006', producer=self.prod)
         self._create_client(
             url='ws://localhost:9006/sequence%2F%C3%BCnic%C3%B6d%C3%A9%3F%2FName/subscribe',
@@ -213,8 +213,8 @@ def test_url_encoded_components(self):
 
         self._connect()
 
-        self.assertEquals(sequence_id, self.cproto._sequence_identifier)
-        self.assertEquals(sequence_id, self.sproto._sequence_identifier)
+        self.assertEqual(sequence_id, self.cproto._sequence_identifier)
+        self.assertEqual(sequence_id, self.sproto._sequence_identifier)
 
     def tearDown(self):
         self.ctr.loseConnection()
@@ -248,8 +248,8 @@ def test_serv_cons_client_prod_success(self):
 
         self.cons.register.assert_called_with(self.sproto)
         self.prod.register.assert_called_with(self.cproto)
-        self.assertEquals(self.sproto.action, 'publish')
-        self.assertEquals(self.cproto.action, 'publish')
+        self.assertEqual(self.sproto.action, 'publish')
+        self.assertEqual(self.cproto.action, 'publish')
 
         # Sending data
         doc = 'producer client sample'
@@ -297,8 +297,8 @@ def fail_parsing(data, **kwargs):
 
         self.cons.register.assert_called_with(self.sproto)
         self.prod.register.assert_called_with(self.cproto)
-        self.assertEquals(self.sproto.action, 'publish')
-        self.assertEquals(self.cproto.action, 'publish')
+        self.assertEqual(self.sproto.action, 'publish')
+        self.assertEqual(self.cproto.action, 'publish')
 
         # Sending data
         doc = 'producer client sample'
@@ -314,7 +314,7 @@ def fail_parsing(data, **kwargs):
 
         # The connection should be broken by now
 
-        self.assertEquals(self.sproto.state, self.sproto.STATE_CLOSED)
+        self.assertEqual(self.sproto.state, self.sproto.STATE_CLOSED)
         self.assertFalse(self.sproto.wasClean)
 
     def test_consumer_to_consumer_error(self):
@@ -355,7 +355,7 @@ def test_consumer_send_data_error(self):
         self.cproto.dataReceived('consumers should not send data')
 
         # This should make the connection kick the bucket
-        self.assertEquals(self.cproto.state, self.cproto.STATE_CLOSED)
+        self.assertEqual(self.cproto.state, self.cproto.STATE_CLOSED)
         self.assertFalse(self.cproto.wasClean)
 
 
@@ -459,8 +459,8 @@ def test_successful_reception(self):
 
         doc = 'document reception test'
 
-        self.assertEquals(self.protocol1.consumer, self.carriage)
-        self.assertEquals(self.protocol2.consumer, self.carriage)
+        self.assertEqual(self.protocol1.consumer, self.carriage)
+        self.assertEqual(self.protocol2.consumer, self.carriage)
 
         self.carriage.write(data=doc)
 
diff --git a/ebu_tt_live/twisted/websocket.py b/ebu_tt_live/twisted/websocket.py
index 6abab4f61..45ad1df7a 100644
--- a/ebu_tt_live/twisted/websocket.py
+++ b/ebu_tt_live/twisted/websocket.py
@@ -82,7 +82,7 @@ class EBUWebsocketProtocolMixin(object):
 
     _sequence_identifier = None
     _action = None
-    _path_format = u'{sequence_identifier}/{action}'
+    _path_format = '{sequence_identifier}/{action}'
     _valid_actions = [
         'publish',
         'subscribe'
diff --git a/ebu_tt_live/utils.py b/ebu_tt_live/utils.py
index 0ef4a0ec7..cd4c88553 100644
--- a/ebu_tt_live/utils.py
+++ b/ebu_tt_live/utils.py
@@ -1,7 +1,7 @@
 import abc
 import collections
 import threading
-import Queue
+import queue
 import os
 import time
 import types
@@ -118,7 +118,7 @@ def __init__(self, maxlen, asynchronous=True):
         super(RotatingFileBuffer, self).__init__(maxlen=maxlen, callback=self.delete_file)
         # In this case threads make sense since it is I/O we are going to be waiting for and that is releasing the GIL.
         # Deletion is the means for us to send down files for deletion to the other thread(maybe process later)....
-        self._deletion_queue = Queue.Queue()
+        self._deletion_queue = queue.Queue()
         if asynchronous is True:
             self._deletion_thread = StoppableThread(
                 target=self._delete_thread_loop,
@@ -150,7 +150,7 @@ def _do_delete(cls, files_waiting):
     def _do_consume(cls, q, files_waiting, default_wait):
         try:
             files_waiting.append(q.get(timeout=default_wait))
-        except Queue.Empty:
+        except queue.Empty:
             pass
 
         failed_files = cls._do_delete(files_waiting)
@@ -266,7 +266,7 @@ def validate_types_only(value, member_name, class_name):
     if not isinstance(value, tuple):
         value = (value,)
     for item in value:
-        if not isinstance(item, (type, types.ClassType)) and item is not ANY:
+        if not isinstance(item, type) and item is not ANY:
             raise TypeError(
                 'Abstract static member: \'{}.{}\' is not a type or class'.format(
                     class_name,
@@ -319,7 +319,7 @@ class AutoRegisteringABCMeta(abc.ABCMeta):
     def __new__(mcls, name, bases, namespace):
         cls = super(AutoRegisteringABCMeta, mcls).__new__(mcls, name, bases, namespace)
         abstract_members = set(name
-                        for name, value in namespace.items()
+                        for name, value in list(namespace.items())
                         if isinstance(value, AbstractStaticMember))
 
         abstracts = getattr(cls, "__abstractmethods__", set())
@@ -349,7 +349,7 @@ def __new__(mcls, name, bases, namespace):
         if namespace.get('auto_register_impl') is None:
             cls.auto_register_impl = classmethod(lambda x, y: None)
         cls._abc_static_members = frozenset(abstract_members)
-        cls._abc_interface = '__metaclass__' in namespace.keys()
+        cls._abc_interface = '__metaclass__' in list(namespace.keys())
         return cls
 
     def __call__(cls, *args, **kwargs):
@@ -429,7 +429,7 @@ def norm_child_text(element):
         return norm_whitespace(child_text(element))
 
     def attrs_dict(element):
-        return dict(element.attributes.items())
+        return dict(list(element.attributes.items()))
 
     def check_element(want_element, got_element):
         if want_element.tagName != got_element.tagName:
diff --git a/testing/bdd/test_handover.py b/testing/bdd/test_handover.py
index b53a6f920..c583a1fb3 100644
--- a/testing/bdd/test_handover.py
+++ b/testing/bdd/test_handover.py
@@ -102,7 +102,7 @@ def then_handover_parameter_passthrough(given_handover_node, authors_group_ident
 def then_authors_group_selected_sequence_id(given_handover_node, authors_group_selected_sequence_identifiers):
     # NOTE: The comma is a valid sequenceIdentifier character but we use it as a divisor in the test. Make sure
     # the tests use sequence identifiers without commas.
-    seq_ids = map(lambda x: x.strip(), authors_group_selected_sequence_identifiers.split(','))
+    seq_ids = [x.strip() for x in authors_group_selected_sequence_identifiers.split(',')]
     for index, call_args in enumerate(given_handover_node.producer_carriage.emit_data.call_args_list):
         pos_args, kw_args = call_args
         assert kw_args['data'].authors_group_selected_sequence_identifier == seq_ids[index]
diff --git a/testing/bdd/test_segmentation.py b/testing/bdd/test_segmentation.py
index 2936a5b2f..d10aaa744 100644
--- a/testing/bdd/test_segmentation.py
+++ b/testing/bdd/test_segmentation.py
@@ -234,7 +234,7 @@ def then_fragment_styles_present(test_context, frag_styles):
     styling = fragment.binding.head.styling
     styles_present = []
     if frag_styles:
-        styles_required = map(lambda item: item.strip(), frag_styles.split(','))
+        styles_required = [item.strip() for item in frag_styles.split(',')]
     else:
         styles_required = []
 
@@ -251,7 +251,7 @@ def then_fragment_regions_present(test_context, frag_regions):
     layout = fragment.binding.head.layout
     regions_present = []
     if frag_regions:
-        regions_required = map(lambda item: item.strip(), frag_regions.split(','))
+        regions_required = [item.strip() for item in frag_regions.split(',')]
     else:
         regions_required = []
 
diff --git a/testing/test_integration.py b/testing/test_integration.py
index cfaad8d36..5d20a5043 100644
--- a/testing/test_integration.py
+++ b/testing/test_integration.py
@@ -1,5 +1,5 @@
 
 
 def test_dummy():
-    print 'test the testing'
+    print('test the testing')
     assert 1

From ded525728ae547aedadf3ee3811c06e5204f719d Mon Sep 17 00:00:00 2001
From: PyvesB <pierre-yves.bigourdan@bbc.co.uk>
Date: Wed, 17 Jul 2019 09:51:23 +0100
Subject: [PATCH 04/16] Make ComparableMixin hashable

---
 ebu_tt_live/utils.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ebu_tt_live/utils.py b/ebu_tt_live/utils.py
index cd4c88553..b12c019c1 100644
--- a/ebu_tt_live/utils.py
+++ b/ebu_tt_live/utils.py
@@ -62,6 +62,8 @@ def _cmp_checks(self, other):
         """
         pass
 
+    def __hash__(self):
+        return object.__hash__(self)
 
 class RingBufferWithCallback(collections.deque):
     """

From 8c6c966af691e7a8edfe482e887fbea14b62f5d4 Mon Sep 17 00:00:00 2001
From: PyvesB <pierre-yves.bigourdan@bbc.co.uk>
Date: Wed, 17 Jul 2019 09:59:18 +0100
Subject: [PATCH 05/16] Fix stop event name

---
 ebu_tt_live/utils.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ebu_tt_live/utils.py b/ebu_tt_live/utils.py
index b12c019c1..00b3bc09c 100644
--- a/ebu_tt_live/utils.py
+++ b/ebu_tt_live/utils.py
@@ -94,13 +94,13 @@ class StoppableThread(threading.Thread):
 
     def __init__(self, *args, **kwargs):
         super(StoppableThread, self).__init__(*args, **kwargs)
-        self._stop = threading.Event()
+        self._stopper = threading.Event()
 
     def stop(self):
-        self._stop.set()
+        self._stopper.set()
 
     def stopped(self):
-        return self._stop.isSet()
+        return self._stopper.isSet()
 
 
 class RotatingFileBufferStopped(Exception):

From 4b29396e85f2802e020be1fadc41716306e5c717 Mon Sep 17 00:00:00 2001
From: PyvesB <pierre-yves.bigourdan@bbc.co.uk>
Date: Wed, 17 Jul 2019 10:00:18 +0100
Subject: [PATCH 06/16] Switch to special method name for /

---
 ebu_tt_live/bindings/_ebuttdt.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ebu_tt_live/bindings/_ebuttdt.py b/ebu_tt_live/bindings/_ebuttdt.py
index acbbc8c19..8cdf1b331 100644
--- a/ebu_tt_live/bindings/_ebuttdt.py
+++ b/ebu_tt_live/bindings/_ebuttdt.py
@@ -553,7 +553,7 @@ def _do_div(self, other):
         else:
             return NotImplemented
 
-    def __div__(self, other):
+    def __truediv__(self, other):
         return self._do_div(other)
 
     def _do_eq(self, other):

From 7b0dd236711e6eeceae57300b2862ba0c45a07ed Mon Sep 17 00:00:00 2001
From: PyvesB <pierre-yves.bigourdan@bbc.co.uk>
Date: Wed, 17 Jul 2019 10:03:54 +0100
Subject: [PATCH 07/16] Fix error message assertions

---
 ebu_tt_live/node/test/test_consumer_unit.py | 2 +-
 ebu_tt_live/node/test/test_delay_unit.py    | 2 +-
 ebu_tt_live/node/test/test_encoder.py       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ebu_tt_live/node/test/test_consumer_unit.py b/ebu_tt_live/node/test/test_consumer_unit.py
index 88232b77a..6c4d1a986 100644
--- a/ebu_tt_live/node/test/test_consumer_unit.py
+++ b/ebu_tt_live/node/test/test_consumer_unit.py
@@ -59,7 +59,7 @@ def test_process_two_documents_ignore_second_sequence_id(self):
         with self.assertRaises(UnexpectedSequenceIdentifierError) as context:
             self.consumer.process_document(document=second_sequence)
 
-        self.assertTrue('Rejecting new sequence identifier' in context.exception.message)
+        self.assertTrue('Rejecting new sequence identifier' in context.exception.args[0])
 
 
     def test_control_request(self):
diff --git a/ebu_tt_live/node/test/test_delay_unit.py b/ebu_tt_live/node/test/test_delay_unit.py
index 8dabdc75d..a75f69405 100644
--- a/ebu_tt_live/node/test/test_delay_unit.py
+++ b/ebu_tt_live/node/test/test_delay_unit.py
@@ -61,7 +61,7 @@ def test_process_two_documents_ignore_second_sequence_id(self):
         with self.assertRaises(UnexpectedSequenceIdentifierError) as context:
             self.retiming_delay_node.process_document(document=second_sequence)
 
-        self.assertTrue('Rejecting new sequence identifier' in context.exception.message)
+        self.assertTrue('Rejecting new sequence identifier' in context.exception.args[0])
 
     def test_if_metadata_applied_processing_is_defined(self):
 
diff --git a/ebu_tt_live/node/test/test_encoder.py b/ebu_tt_live/node/test/test_encoder.py
index 043bf6218..b8c8280f4 100644
--- a/ebu_tt_live/node/test/test_encoder.py
+++ b/ebu_tt_live/node/test/test_encoder.py
@@ -114,7 +114,7 @@ def test_process_two_documents_ignore_second_sequence_id(self):
         with self.assertRaises(UnexpectedSequenceIdentifierError) as context:
             self.encoder.process_document(document=second_sequence)
 
-        self.assertTrue('Rejecting new sequence identifier' in context.exception.message)
+        self.assertTrue('Rejecting new sequence identifier' in context.exception.args[0])
 
     def test_basic_operation(self):
         doc = self._create_test_document()

From 039b0c6f36b055759d2a5b8b18aa49015aa48b61 Mon Sep 17 00:00:00 2001
From: PyvesB <pierre-yves.bigourdan@bbc.co.uk>
Date: Wed, 17 Jul 2019 10:11:58 +0100
Subject: [PATCH 08/16] Tweak file mode to accept str

---
 ebu_tt_live/test/test_utils.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ebu_tt_live/test/test_utils.py b/ebu_tt_live/test/test_utils.py
index 5c8dc6aea..6e7dfa9e2 100644
--- a/ebu_tt_live/test/test_utils.py
+++ b/ebu_tt_live/test/test_utils.py
@@ -51,6 +51,7 @@ def tearDown(self):
 
     def _create_a_file(self, number):
         created_file = tempfile.NamedTemporaryFile(
+            mode='w+',
             prefix='ebu_tt_live_utils_test',
             suffix='{}.tmp'.format(number),
             delete=False

From 0ebc51b19fc5f6e7edf1e45aee8f91465b708d9d Mon Sep 17 00:00:00 2001
From: PyvesB <pierre-yves.bigourdan@bbc.co.uk>
Date: Wed, 17 Jul 2019 10:13:41 +0100
Subject: [PATCH 09/16] Try instantiating interface to get TypeError

---
 ebu_tt_live/carriage/test/test_base_carriage.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ebu_tt_live/carriage/test/test_base_carriage.py b/ebu_tt_live/carriage/test/test_base_carriage.py
index fdb1d48e8..d24060ccc 100644
--- a/ebu_tt_live/carriage/test/test_base_carriage.py
+++ b/ebu_tt_live/carriage/test/test_base_carriage.py
@@ -17,7 +17,7 @@ class DummyDataTypeB(object):
 class TestABCs(TestCase):
 
     def test_interfaces(self):
-        self.assertRaises(TypeError, carriage_interface.ICarriageMechanism)
+        self.assertRaises(TypeError, carriage_interface.ICarriageMechanism())
         self.assertRaises(TypeError, carriage_interface.IProducerCarriage)
         self.assertRaises(TypeError, carriage_interface.IConsumerCarriage)
 

From 25147c285656fdfd8563685b8504a2957c4f4fd2 Mon Sep 17 00:00:00 2001
From: PyvesB <pierre-yves.bigourdan@bbc.co.uk>
Date: Wed, 17 Jul 2019 10:16:32 +0100
Subject: [PATCH 10/16] Fix str/byte inconsistencies

---
 .../twisted/test/test_twisted_websocket.py     | 18 +++++++++---------
 ebu_tt_live/twisted/websocket.py               |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ebu_tt_live/twisted/test/test_twisted_websocket.py b/ebu_tt_live/twisted/test/test_twisted_websocket.py
index 4c18e7753..3448c7449 100644
--- a/ebu_tt_live/twisted/test/test_twisted_websocket.py
+++ b/ebu_tt_live/twisted/test/test_twisted_websocket.py
@@ -95,7 +95,7 @@ def test_server_prod_client_cons_success(self):
         self.assertEqual(self.sproto.action, 'subscribe')
 
         # At this point we are supposed to be able to send data through
-        doc = 'dummy message'
+        doc = b'dummy message'
         self.sproto.sendSequenceMessage(
             sequence_identifier=self.sequence_identifier,
             payload=doc
@@ -147,7 +147,7 @@ def fail_parsing(data, **kwargs):
         self.assertEqual(self.sproto.action, 'subscribe')
 
         # At this point we are supposed to be able to send data through
-        doc = 'dummy message'
+        doc = b'dummy message'
         self.sproto.sendSequenceMessage(
             sequence_identifier=self.sequence_identifier,
             payload=doc
@@ -182,7 +182,7 @@ def test_consumer_send_data_error(self):
         self._connect()
 
         # When data arrives from consumer to server
-        self.sproto.dataReceived('consumers should not send data')
+        self.sproto.dataReceived(b'consumers should not send data')
 
         # This must have triggered the connection to be dropped
         self.assertEqual(self.sproto.state, self.sproto.STATE_CLOSED)
@@ -252,7 +252,7 @@ def test_serv_cons_client_prod_success(self):
         self.assertEqual(self.cproto.action, 'publish')
 
         # Sending data
-        doc = 'producer client sample'
+        doc = b'producer client sample'
         self.cproto.sendSequenceMessage(
             sequence_identifier=self.sequence_identifier,
             payload=doc
@@ -301,7 +301,7 @@ def fail_parsing(data, **kwargs):
         self.assertEqual(self.cproto.action, 'publish')
 
         # Sending data
-        doc = 'producer client sample'
+        doc = b'producer client sample'
         self.cproto.sendSequenceMessage(
             sequence_identifier=self.sequence_identifier,
             payload=doc
@@ -352,7 +352,7 @@ def test_consumer_send_data_error(self):
 
         self._connect()
 
-        self.cproto.dataReceived('consumers should not send data')
+        self.cproto.dataReceived(b'consumers should not send data')
 
         # This should make the connection kick the bucket
         self.assertEqual(self.cproto.state, self.cproto.STATE_CLOSED)
@@ -379,7 +379,7 @@ def setUp(self):
 
     def test_successful_broadcast(self):
 
-        doc = 'test_data'
+        doc = b'test_data'
         self.carriage.emit_data(
             sequence_identifier=self.sequence_identifier,
             data=doc
@@ -410,7 +410,7 @@ def test_successful_broadcast(self):
         self.protocol2.sendSequenceMessage.assert_not_called()
 
     def test_delayed_broadcast(self):
-        doc = 'delayed test data'
+        doc = b'delayed test data'
         delay = 5.0
         clock = task.Clock()
         self.carriage._callLater = clock.callLater
@@ -457,7 +457,7 @@ def setUp(self):
 
     def test_successful_reception(self):
 
-        doc = 'document reception test'
+        doc = b'document reception test'
 
         self.assertEqual(self.protocol1.consumer, self.carriage)
         self.assertEqual(self.protocol2.consumer, self.carriage)
diff --git a/ebu_tt_live/twisted/websocket.py b/ebu_tt_live/twisted/websocket.py
index 45ad1df7a..68f11f123 100644
--- a/ebu_tt_live/twisted/websocket.py
+++ b/ebu_tt_live/twisted/websocket.py
@@ -174,7 +174,7 @@ def _do_write(self, sequence_identifier, data):
         for conn in self._connections:
             conn.sendSequenceMessage(
                 sequence_identifier=sequence_identifier,
-                payload=data.encode("utf-8")
+                payload=data
             )
 
     def resumeProducing(self):
@@ -544,7 +544,7 @@ def broadcast(self, channel, msg):
         log.info("broadcasting message...")
 
         for c in self._clients:
-            c.sendMessageOnChannel(channel, msg.encode("utf-8"), isBinary=False, doNotCompress=False, sync=False)
+            c.sendMessageOnChannel(channel, msg, isBinary=False, doNotCompress=False, sync=False)
 
     def stopFactory(self):
         self.unregisterProducer()

From 39b12f3db2739444efa10a1fc507b8bbcc093acd Mon Sep 17 00:00:00 2001
From: PyvesB <pierre-yves.bigourdan@bbc.co.uk>
Date: Wed, 17 Jul 2019 10:18:28 +0100
Subject: [PATCH 11/16] Update Readme

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 088e72616..8a812c145 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ If you would like to contribute or join the Slack team, please contact <subtitli
 Preparing the build environment
 ===============================
 
-Make sure you have python 2.7+. Make sure you have python virtual environment capability.
+Make sure you have Python 3+. Make sure you have python virtual environment capability.
 
 If not you can install virtualenv systemwide from your operating system's package repository
 or by pip:
@@ -61,7 +61,7 @@ Windows users
 =============
 
 Windows is not the best friend of Makefiles. So there is a make.bat file for those who would like to develop using
-Windows. Assuming python 2.7 and virtualenv is installed and are on the PATH. To build the project you will also need node.js. Please read the instructions for your system [here](https://nodejs.org/en/download/package-manager/). Then run :
+Windows. Assuming Python 3+ and virtualenv is installed and are on the PATH. To build the project you will also need node.js. Please read the instructions for your system [here](https://nodejs.org/en/download/package-manager/). Then run :
 
     make
 

From 090e6c07cd583e49c921a1438bb9affc3fbfced7 Mon Sep 17 00:00:00 2001
From: Nigel Megitt <nigel.megitt@bbc.co.uk>
Date: Wed, 17 Jul 2019 16:36:02 +0100
Subject: [PATCH 12/16] Don't call fixtures directly

Closes #490.

Calling fixtures directly is deprecated, this solution described at
https://docs.pytest.org/en/latest/deprecations.html#calling-fixtures-directly
seems to work, creating a named fixture rather than defining the "then"
step as a fixture directly.
---
 testing/bdd/conftest.py | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/testing/bdd/conftest.py b/testing/bdd/conftest.py
index d4e086ead..5506b0903 100644
--- a/testing/bdd/conftest.py
+++ b/testing/bdd/conftest.py
@@ -25,13 +25,20 @@ def template_file_one(xml_file_1):
     return j2_env.get_template(xml_file_1)
 
 @then('a second xml file <xml_file_2>')
-@pytest.fixture
 def template_file_two(xml_file_2):
     cur_dir = os.path.dirname(os.path.abspath(__file__))
     j2_env = Environment(loader=FileSystemLoader(os.path.join(cur_dir, 'templates')),
                          trim_blocks=True)
     return j2_env.get_template(xml_file_2)
 
+# Calling fixtures directly is deprecated, this solution described at
+# https://docs.pytest.org/en/latest/deprecations.html#calling-fixtures-directly
+# seems to work, creating a named fixture rather than defining the "then"
+# step as a fixture directly.
+@pytest.fixture(name='template_file_two')
+def template_file_two_fixture(xml_file_2):
+    return template_file_two(xml_file_2)
+    
 # NOTE: Some of the code below includes handling of SMPTE time base, which was removed from version 1.0 of the specification.
 
 @given('a sequence <sequence_identifier> with timeBase <time_base>')
@@ -97,7 +104,6 @@ def gen_first_document(test_context, template_dict, template_file_one):
     return document1
 
 @then('the second document is generated')
-@pytest.fixture
 def gen_second_document(test_context, template_dict, template_file_two):
     xml_file_2 = template_file_two.render(template_dict)
     document2 = EBUTT3Document.create_from_xml(xml_file_2)
@@ -105,6 +111,13 @@ def gen_second_document(test_context, template_dict, template_file_two):
     document2.validate()
     return document2
 
+# Calling fixtures directly is deprecated, this solution described at
+# https://docs.pytest.org/en/latest/deprecations.html#calling-fixtures-directly
+# seems to work, creating a named fixture rather than defining the "then"
+# step as a fixture directly.
+@pytest.fixture(name='gen_second_document')
+def gen_second_document_fixture(test_context, template_dict, template_file_two):
+    return gen_second_document(test_context, template_dict, template_file_two)
 
 @then('EBUTTD document is valid')
 def then_ebuttd_document_valid(test_context):

From 13fc3db2104036cf2527edb5bab69fa517e3f2a9 Mon Sep 17 00:00:00 2001
From: nigelmegitt <nigel.megitt@bbc.co.uk>
Date: Fri, 11 Oct 2019 17:11:42 +0100
Subject: [PATCH 13/16] Until we fix twisted websocket testing, mark failing
 tests as failing

---
 ebu_tt_live/twisted/test/test_twisted_websocket.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ebu_tt_live/twisted/test/test_twisted_websocket.py b/ebu_tt_live/twisted/test/test_twisted_websocket.py
index 3448c7449..25a6dc057 100644
--- a/ebu_tt_live/twisted/test/test_twisted_websocket.py
+++ b/ebu_tt_live/twisted/test/test_twisted_websocket.py
@@ -6,6 +6,7 @@
 from ebu_tt_live.errors import UnexpectedSequenceIdentifierError
 from mock import MagicMock
 from ebu_tt_live.node.interface import IProducerNode, IConsumerNode
+import pytest
 
 from twisted.internet import task
 import twisted.internet.base
@@ -75,6 +76,7 @@ def setUp(self):
         self.cons = MagicMock()
         self.sequence_identifier = 'TestSeq01'
 
+    @pytest.mark.xfail(reason="Twisted deferred testing needs to be reworked.")
     def test_server_prod_client_cons_success(self):
         self._create_server(url='ws://localhost:9005', producer=self.prod)
         self._create_client(
@@ -121,6 +123,7 @@ def test_server_prod_client_cons_success(self):
 
         # And that is our success case here
 
+    @pytest.mark.xfail(reason="Twisted deferred testing needs to be reworked.")
     def test_server_prod_client_cons_wrong_sequence_error(self):
         # This test emulates the data parsing raising the UnexpectedSequenceIdentifierError
         def fail_parsing(data, **kwargs):
@@ -167,6 +170,7 @@ def fail_parsing(data, **kwargs):
         self.assertEqual(self.cproto.state, self.sproto.STATE_CLOSED)
         self.assertFalse(self.cproto.wasClean)
 
+    @pytest.mark.xfail(reason="Twisted deferred testing needs to be reworked.")
     def test_consumer_send_data_error(self):
         self._create_server(url='ws://localhost:9005', producer=self.prod)
         self._create_client(
@@ -188,6 +192,7 @@ def test_consumer_send_data_error(self):
         self.assertEqual(self.sproto.state, self.sproto.STATE_CLOSED)
         self.assertFalse(self.sproto.wasClean)
 
+    @pytest.mark.xfail(reason="Twisted deferred testing needs to be reworked.")
     def test_producer_to_producer_error(self):
         self._create_server(url='ws://localhost:9005', producer=self.prod)
         self._create_client(
@@ -228,6 +233,7 @@ def setUp(self):
         self.cons = MagicMock()
         self.sequence_identifier = 'TestSeq01'
 
+    @pytest.mark.xfail(reason="Twisted deferred testing needs to be reworked.")
     def test_serv_cons_client_prod_success(self):
 
         self._create_server(
@@ -273,6 +279,7 @@ def test_serv_cons_client_prod_success(self):
         self.cons.unregister.assert_called_with(self.sproto)
         self.prod.unregister.assert_called_with(self.cproto)
 
+    @pytest.mark.xfail(reason="Twisted deferred testing needs to be reworked.")
     def test_serv_cons_client_prod_wrong_sequence_error(self):
         def fail_parsing(data, **kwargs):
             raise UnexpectedSequenceIdentifierError()
@@ -317,6 +324,7 @@ def fail_parsing(data, **kwargs):
         self.assertEqual(self.sproto.state, self.sproto.STATE_CLOSED)
         self.assertFalse(self.sproto.wasClean)
 
+    @pytest.mark.xfail(reason="Twisted deferred testing needs to be reworked.")
     def test_consumer_to_consumer_error(self):
         self._create_server(
             url='ws://localhost:9005',
@@ -335,6 +343,7 @@ def test_consumer_to_consumer_error(self):
         # This is not meant to survive the handshake
         self.assertRaises(AssertionError, self._connect)
 
+    @pytest.mark.xfail(reason="Twisted deferred testing needs to be reworked.")
     def test_consumer_send_data_error(self):
         self._create_server(
             url='ws://localhost:9005',

From 92b972cca6f1476508d3a354fc5edf83e711ffe5 Mon Sep 17 00:00:00 2001
From: nigelmegitt <nigel.megitt@bbc.co.uk>
Date: Fri, 11 Oct 2019 17:12:24 +0100
Subject: [PATCH 14/16] drive-by python3 fixes to comments

---
 docs/source/conf.py                               | 2 +-
 ebu_tt_live/documents/test/test_memory_profile.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index c58084f83..e83ea8c1e 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -153,7 +153,7 @@
 # The name for this set of Sphinx documents.
 # "<project> v<release> documentation" by default.
 #
-# html_title = u'EBU-TT-Live Toolkit v1.0.0rc1'
+# html_title = 'EBU-TT-Live Toolkit v1.0.0rc1'
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #
diff --git a/ebu_tt_live/documents/test/test_memory_profile.py b/ebu_tt_live/documents/test/test_memory_profile.py
index a3af66470..95ebf2596 100644
--- a/ebu_tt_live/documents/test/test_memory_profile.py
+++ b/ebu_tt_live/documents/test/test_memory_profile.py
@@ -68,7 +68,7 @@ def _generate_document(self, sequence_number=1, offset=None):
         doc = EBUTT3Document.create_from_xml(
             template_file.render(temp_dict)
         )
-        # print 'doc id {} created'.format(id(doc))
+        # print('doc id {} created'.format(id(doc)))
         return doc
 
     def test_single_document_removed(self):

From 643b299584e1fcbee31049788f3b98015728b745 Mon Sep 17 00:00:00 2001
From: nigelmegitt <nigel.megitt@bbc.co.uk>
Date: Fri, 11 Oct 2019 17:18:41 +0100
Subject: [PATCH 15/16] Update .travis.yml to use python3.7 and pip 19.2.3

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c610dfd76..221a65f75 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: python
 
 python:
-  - '2.7'
+  - '3.7'
 
 branches:
   except:
@@ -21,7 +21,7 @@ before_install:
   - git fetch origin -f gh-pages:gh-pages
 
 install:
-  - pip install pip==9.0.1
+  - pip install pip==19.2.3
   - make
   - python setup.py develop
   - pip install coveralls

From 19807d473535fa625e144159761246cc76169752 Mon Sep 17 00:00:00 2001
From: nigelmegitt <nigel.megitt@bbc.co.uk>
Date: Fri, 11 Oct 2019 17:28:32 +0100
Subject: [PATCH 16/16] Use make scripts in .travis.yml so that remote build
 tracks local build changes

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 221a65f75..3f9f9caf8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,15 +28,15 @@ install:
   - pip install ghp-import
 
 script:
-  - pyxbgen --binding-root=./ebu_tt_live/bindings -m __init__ --schema-root=./ebu_tt_live/xsd/ -r -u ebutt_all.xsd
-  - python setup.py test
+  - make bindings
+  - make test
   - export PR=https://api.github.com/repos/$TRAVIS_REPO_SLUG/pulls/$TRAVIS_PULL_REQUEST
   - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo `curl -s $PR | jq -r .head.ref`; fi)
   - echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, PR=$PR, BRANCH=$BRANCH"
 
 after_success:
   - coveralls
-  - python setup.py build_sphinx
+  - make docs
   - if [ $BRANCH == "master" ]; then ghp-import -n -p -m "Update gh-pages." docs/build; fi
 
 notifications: