Merge "Dropping explicit unicode literal"
This commit is contained in:
commit
99b2c60fcc
|
@ -25,7 +25,7 @@ extensions = [
|
||||||
master_doc = 'index'
|
master_doc = 'index'
|
||||||
|
|
||||||
# General information about the project.
|
# 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.
|
# If true, '()' will be appended to :func: etc. cross-reference text.
|
||||||
add_function_parentheses = True
|
add_function_parentheses = True
|
||||||
|
@ -62,7 +62,7 @@ openstackdocs_bug_tag = ''
|
||||||
# (source start file, target name, title, author, documentclass
|
# (source start file, target name, title, author, documentclass
|
||||||
# [howto/manual]).
|
# [howto/manual]).
|
||||||
latex_documents = [
|
latex_documents = [
|
||||||
('index', 'doc-os-brick.tex', u'OS Brick Documentation',
|
('index', 'doc-os-brick.tex', 'OS Brick Documentation',
|
||||||
'Cinder Contributors', 'manual')
|
'Cinder Contributors', 'manual')
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
@ -48,8 +48,8 @@ class TestExecutor(base.TestCase):
|
||||||
executor = brick_executor.Executor(root_helper=None)
|
executor = brick_executor.Executor(root_helper=None)
|
||||||
exc = self.assertRaises(putils.ProcessExecutionError,
|
exc = self.assertRaises(putils.ProcessExecutionError,
|
||||||
executor._execute)
|
executor._execute)
|
||||||
self.assertEqual(u'Espa\xf1a', exc.stdout)
|
self.assertEqual('Espa\xf1a', exc.stdout)
|
||||||
self.assertEqual(u'Z\xfcrich', exc.stderr)
|
self.assertEqual('Z\xfcrich', exc.stderr)
|
||||||
|
|
||||||
@mock.patch('sys.stdin', encoding='UTF-8')
|
@mock.patch('sys.stdin', encoding='UTF-8')
|
||||||
@mock.patch('os_brick.executor.priv_rootwrap.execute')
|
@mock.patch('os_brick.executor.priv_rootwrap.execute')
|
||||||
|
@ -58,8 +58,8 @@ class TestExecutor(base.TestCase):
|
||||||
|
|
||||||
executor = brick_executor.Executor(root_helper=None)
|
executor = brick_executor.Executor(root_helper=None)
|
||||||
stdout, stderr = executor._execute()
|
stdout, stderr = executor._execute()
|
||||||
self.assertEqual(u'Espa\xf1a', stdout)
|
self.assertEqual('Espa\xf1a', stdout)
|
||||||
self.assertEqual(u'Z\xfcrich', stderr)
|
self.assertEqual('Z\xfcrich', stderr)
|
||||||
|
|
||||||
@mock.patch('sys.stdin', encoding='UTF-8')
|
@mock.patch('sys.stdin', encoding='UTF-8')
|
||||||
@mock.patch('os_brick.executor.priv_rootwrap.execute')
|
@mock.patch('os_brick.executor.priv_rootwrap.execute')
|
||||||
|
@ -71,8 +71,8 @@ class TestExecutor(base.TestCase):
|
||||||
executor = brick_executor.Executor(root_helper=None)
|
executor = brick_executor.Executor(root_helper=None)
|
||||||
exc = self.assertRaises(putils.ProcessExecutionError,
|
exc = self.assertRaises(putils.ProcessExecutionError,
|
||||||
executor._execute)
|
executor._execute)
|
||||||
self.assertEqual(u'Espa\xf1a', exc.stdout)
|
self.assertEqual('Espa\xf1a', exc.stdout)
|
||||||
self.assertEqual(u'Z\xfcrich', exc.stderr)
|
self.assertEqual('Z\xfcrich', exc.stderr)
|
||||||
|
|
||||||
@mock.patch('sys.stdin', encoding='UTF-8')
|
@mock.patch('sys.stdin', encoding='UTF-8')
|
||||||
@mock.patch('os_brick.executor.priv_rootwrap.execute')
|
@mock.patch('os_brick.executor.priv_rootwrap.execute')
|
||||||
|
@ -82,8 +82,8 @@ class TestExecutor(base.TestCase):
|
||||||
|
|
||||||
executor = brick_executor.Executor(root_helper=None)
|
executor = brick_executor.Executor(root_helper=None)
|
||||||
stdout, stderr = executor._execute()
|
stdout, stderr = executor._execute()
|
||||||
self.assertEqual(u'Espa\xf1a', stdout)
|
self.assertEqual('Espa\xf1a', stdout)
|
||||||
self.assertEqual(u'Z\xfcrich', stderr)
|
self.assertEqual('Z\xfcrich', stderr)
|
||||||
|
|
||||||
|
|
||||||
class TestThread(base.TestCase):
|
class TestThread(base.TestCase):
|
||||||
|
|
|
@ -34,7 +34,7 @@ source_suffix = '.rst'
|
||||||
master_doc = 'index'
|
master_doc = 'index'
|
||||||
|
|
||||||
# General information about the project.
|
# 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
|
# Release notes are unversioned, so we don't need to set version and release
|
||||||
version = ''
|
version = ''
|
||||||
|
|
Loading…
Reference in New Issue