Browse Source

Merge "Dropping explicit unicode literal"

changes/11/780511/1
Zuul 7 months ago
committed by Gerrit Code Review
parent
commit
99b2c60fcc
  1. 4
      doc/source/conf.py
  2. 16
      os_brick/tests/test_executor.py
  3. 2
      releasenotes/source/conf.py

4
doc/source/conf.py

@ -25,7 +25,7 @@ extensions = [
master_doc = 'index'
# General information about the project.
copyright = u'2015, OpenStack Foundation'
copyright = '2015, OpenStack Foundation'
# If true, '()' will be appended to :func: etc. cross-reference text.
add_function_parentheses = True
@ -62,7 +62,7 @@ openstackdocs_bug_tag = ''
# (source start file, target name, title, author, documentclass
# [howto/manual]).
latex_documents = [
('index', 'doc-os-brick.tex', u'OS Brick Documentation',
('index', 'doc-os-brick.tex', 'OS Brick Documentation',
'Cinder Contributors', 'manual')
]

16
os_brick/tests/test_executor.py

@ -48,8 +48,8 @@ class TestExecutor(base.TestCase):
executor = brick_executor.Executor(root_helper=None)
exc = self.assertRaises(putils.ProcessExecutionError,
executor._execute)
self.assertEqual(u'Espa\xf1a', exc.stdout)
self.assertEqual(u'Z\xfcrich', exc.stderr)
self.assertEqual('Espa\xf1a', exc.stdout)
self.assertEqual('Z\xfcrich', exc.stderr)
@mock.patch('sys.stdin', encoding='UTF-8')
@mock.patch('os_brick.executor.priv_rootwrap.execute')
@ -58,8 +58,8 @@ class TestExecutor(base.TestCase):
executor = brick_executor.Executor(root_helper=None)
stdout, stderr = executor._execute()
self.assertEqual(u'Espa\xf1a', stdout)
self.assertEqual(u'Z\xfcrich', stderr)
self.assertEqual('Espa\xf1a', stdout)
self.assertEqual('Z\xfcrich', stderr)
@mock.patch('sys.stdin', encoding='UTF-8')
@mock.patch('os_brick.executor.priv_rootwrap.execute')
@ -71,8 +71,8 @@ class TestExecutor(base.TestCase):
executor = brick_executor.Executor(root_helper=None)
exc = self.assertRaises(putils.ProcessExecutionError,
executor._execute)
self.assertEqual(u'Espa\xf1a', exc.stdout)
self.assertEqual(u'Z\xfcrich', exc.stderr)
self.assertEqual('Espa\xf1a', exc.stdout)
self.assertEqual('Z\xfcrich', exc.stderr)
@mock.patch('sys.stdin', encoding='UTF-8')
@mock.patch('os_brick.executor.priv_rootwrap.execute')
@ -82,8 +82,8 @@ class TestExecutor(base.TestCase):
executor = brick_executor.Executor(root_helper=None)
stdout, stderr = executor._execute()
self.assertEqual(u'Espa\xf1a', stdout)
self.assertEqual(u'Z\xfcrich', stderr)
self.assertEqual('Espa\xf1a', stdout)
self.assertEqual('Z\xfcrich', stderr)
class TestThread(base.TestCase):

2
releasenotes/source/conf.py

@ -34,7 +34,7 @@ source_suffix = '.rst'
master_doc = 'index'
# General information about the project.
copyright = u'2015, Cinder Developers'
copyright = '2015, Cinder Developers'
# Release notes are unversioned, so we don't need to set version and release
version = ''

Loading…
Cancel
Save