diff --git a/doc/source/conf.py b/doc/source/conf.py index 3ee292fb..6340192d 100755 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -37,8 +37,8 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'os-ken' -copyright = u'2018, OpenStack Developers' +project = 'os-ken' +copyright = '2018, OpenStack Developers' # openstackdocstheme options openstackdocs_repo_name = 'openstack/os-ken' @@ -77,8 +77,8 @@ htmlhelp_basename = '%sdoc' % project latex_documents = [ ('index', 'doc-%s.tex' % project, - u'%s Documentation' % project, - u'OpenStack Developers', 'manual'), + '%s Documentation' % project, + 'OpenStack Developers', 'manual'), ] latex_use_xindy = False diff --git a/os_ken/services/protocols/bgp/bmp.py b/os_ken/services/protocols/bgp/bmp.py index ac9b1dde..0e46c33b 100644 --- a/os_ken/services/protocols/bgp/bmp.py +++ b/os_ken/services/protocols/bgp/bmp.py @@ -204,7 +204,7 @@ class BMPClient(Activity): self._socket = socket # send init message init_info = {'type': bmp.BMP_INIT_TYPE_STRING, - 'value': u'This is OSKen BGP BMP message'} + 'value': 'This is OSKen BGP BMP message'} init_msg = bmp.BMPInitiation([init_info]) self._send(init_msg) diff --git a/os_ken/tests/unit/packet/test_bmp.py b/os_ken/tests/unit/packet/test_bmp.py index cad95cbd..a005dcc8 100644 --- a/os_ken/tests/unit/packet/test_bmp.py +++ b/os_ken/tests/unit/packet/test_bmp.py @@ -134,7 +134,7 @@ class Test_bmp(unittest.TestCase): def test_initiation(self): initiation_info = [{'type': bmp.BMP_INIT_TYPE_STRING, - 'value': u'This is OSKen BGP BMP message'}] + 'value': 'This is OSKen BGP BMP message'}] msg = bmp.BMPInitiation(info=initiation_info) binmsg = msg.serialize() msg2, rest = bmp.BMPMessage.parser(binmsg) diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 8f1840f9..e70c3b99 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -52,8 +52,8 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'os_ken Release Notes' -copyright = u'2018, OpenStack Developers' +project = 'os_ken Release Notes' +copyright = '2018, OpenStack Developers' # openstackdocstheme options openstackdocs_repo_name = 'openstack/os-ken' @@ -213,8 +213,8 @@ latex_elements = { # author, documentclass [howto, manual, or own class]). latex_documents = [ ('index', 'os_kenReleaseNotes.tex', - u'os_ken Release Notes Documentation', - u'OpenStack Foundation', 'manual'), + 'os_ken Release Notes Documentation', + 'OpenStack Foundation', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of @@ -244,8 +244,8 @@ latex_documents = [ # (source start file, name, description, authors, manual section). man_pages = [ ('index', 'os_kenrereleasenotes', - u'os_ken Release Notes Documentation', - [u'OpenStack Foundation'], 1) + 'os_ken Release Notes Documentation', + ['OpenStack Foundation'], 1) ] # If true, show URL addresses after external links. @@ -259,8 +259,8 @@ man_pages = [ # dir menu entry, description, category) texinfo_documents = [ ('index', 'os_ken ReleaseNotes', - u'os_ken Release Notes Documentation', - u'OpenStack Foundation', 'os_kenReleaseNotes', + 'os_ken Release Notes Documentation', + 'OpenStack Foundation', 'os_kenReleaseNotes', 'One line description of project.', 'Miscellaneous'), ]