Merge "remove unicode from code"
This commit is contained in:
commit
23b345e745
|
@ -44,8 +44,8 @@ source_suffix = '.rst'
|
|||
master_doc = 'index'
|
||||
|
||||
# General information about the project.
|
||||
project = u'manila-ui'
|
||||
copyright = u'2013, OpenStack Foundation'
|
||||
project = 'manila-ui'
|
||||
copyright = '2013, OpenStack Foundation'
|
||||
|
||||
# If true, '()' will be appended to :func: etc. cross-reference text.
|
||||
add_function_parentheses = True
|
||||
|
@ -85,8 +85,8 @@ htmlhelp_basename = '%sdoc' % project
|
|||
latex_documents = [
|
||||
('index',
|
||||
'doc-%s.tex' % project,
|
||||
u'%s Documentation' % project,
|
||||
u'OpenStack Foundation', 'manual'),
|
||||
'%s Documentation' % project,
|
||||
'OpenStack Foundation', 'manual'),
|
||||
]
|
||||
|
||||
# The name of an image file (relative to this directory) to place at the top of
|
||||
|
|
|
@ -37,7 +37,7 @@ class ShareGroupTypeTests(test.BaseAdminViewTests):
|
|||
def test_create_share_group_type(self):
|
||||
url = reverse('horizon:admin:share_group_types:create')
|
||||
data = {
|
||||
'method': u'CreateShareGroupTypeForm',
|
||||
'method': 'CreateShareGroupTypeForm',
|
||||
'is_public': True,
|
||||
'name': 'my_share_group_type',
|
||||
'share_types': ['foo'],
|
||||
|
|
|
@ -33,9 +33,9 @@ class SecurityServicesViewTests(test.TestCase):
|
|||
def test_create_security_service(self):
|
||||
sec_service = test_data.sec_service
|
||||
formData = {
|
||||
'name': u'new_sec_service',
|
||||
'description': u'This is test security service',
|
||||
'method': u'CreateForm',
|
||||
'name': 'new_sec_service',
|
||||
'description': 'This is test security service',
|
||||
'method': 'CreateForm',
|
||||
'dns_ip': '1.2.3.4',
|
||||
'user': 'SomeUser',
|
||||
'password': 'safepass',
|
||||
|
|
|
@ -284,7 +284,7 @@ class SnapshotSnapshotViewTests(test.TestCase):
|
|||
mock.Mock(side_effect=exc))
|
||||
formData = {
|
||||
'access_type': 'user',
|
||||
'method': u'CreateForm',
|
||||
'method': 'CreateForm',
|
||||
'access_to': 'someuser',
|
||||
}
|
||||
|
||||
|
|
|
@ -93,12 +93,12 @@ class ShareViewTests(test.APITestCase):
|
|||
share_net = test_data.active_share_network
|
||||
share_nets = [share_net]
|
||||
formData = {
|
||||
'name': u'new_share',
|
||||
'description': u'This is test share',
|
||||
'method': u'CreateForm',
|
||||
'name': 'new_share',
|
||||
'description': 'This is test share',
|
||||
'method': 'CreateForm',
|
||||
'share_network': share_net.id,
|
||||
'size': 1,
|
||||
'share_proto': u'NFS',
|
||||
'share_proto': 'NFS',
|
||||
'share_type': 'fake',
|
||||
'share-network-choices-fake': share_net.id,
|
||||
'availability_zone': 'fake_az',
|
||||
|
@ -138,9 +138,9 @@ class ShareViewTests(test.APITestCase):
|
|||
snapshot = test_data.snapshot
|
||||
url = reverse('horizon:project:shares:create')
|
||||
formData = {
|
||||
'name': u'new_share',
|
||||
'description': u'This is test share from snapshot',
|
||||
'method': u'CreateForm',
|
||||
'name': 'new_share',
|
||||
'description': 'This is test share from snapshot',
|
||||
'method': 'CreateForm',
|
||||
'share_network': share_net.id,
|
||||
'size': snapshot.size,
|
||||
'share_proto': 'NFS',
|
||||
|
@ -322,7 +322,7 @@ class ShareViewTests(test.APITestCase):
|
|||
self.mock_object(api_manila, "share_allow")
|
||||
formData = {
|
||||
'access_type': 'user',
|
||||
'method': u'CreateForm',
|
||||
'method': 'CreateForm',
|
||||
'access_to': 'someuser',
|
||||
'access_level': 'rw',
|
||||
}
|
||||
|
@ -619,12 +619,12 @@ class ShareViewTests(test.APITestCase):
|
|||
mock.Mock(return_value=[self.FakeAZ('fake_az'), ]))
|
||||
|
||||
data = {
|
||||
'name': u'new_share',
|
||||
'description': u'This is test share',
|
||||
'method': u'CreateForm',
|
||||
'name': 'new_share',
|
||||
'description': 'This is test share',
|
||||
'method': 'CreateForm',
|
||||
'share_network': test_data.active_share_network.id,
|
||||
'size': 1,
|
||||
'share_proto': u'NFS',
|
||||
'share_proto': 'NFS',
|
||||
'share_type': 'fake',
|
||||
'share-network-choices-fake': test_data.active_share_network.id,
|
||||
'availability_zone': 'fake_az',
|
||||
|
@ -682,8 +682,8 @@ class ShareViewTests(test.APITestCase):
|
|||
api_manila, "share_update", mock.Mock(return_value=self.share))
|
||||
|
||||
data = {
|
||||
'name': u'old_share',
|
||||
'description': u'This is test share',
|
||||
'name': 'old_share',
|
||||
'description': 'This is test share',
|
||||
}
|
||||
if enable_public_shares:
|
||||
data.update({'is_public': is_public})
|
||||
|
|
|
@ -90,7 +90,7 @@ other_share = shares.Share(
|
|||
{'id': "21023e92-8008-1234-8059-7f2293ff3889",
|
||||
'status': 'in-use',
|
||||
'size': 10,
|
||||
'name': u'my_share',
|
||||
'name': 'my_share',
|
||||
'description': '',
|
||||
'share_proto': 'NFS',
|
||||
'metadata': {},
|
||||
|
|
|
@ -61,8 +61,8 @@ source_suffix = '.rst'
|
|||
master_doc = 'index'
|
||||
|
||||
# General information about the project.
|
||||
project = u'manila-ui Release Notes'
|
||||
copyright = u'2016, Manila Developers'
|
||||
project = 'manila-ui Release Notes'
|
||||
copyright = '2016, Manila Developers'
|
||||
|
||||
# Release notes are version independent
|
||||
release = ''
|
||||
|
@ -208,8 +208,8 @@ latex_elements = {
|
|||
# author, documentclass [howto, manual, or own class]).
|
||||
latex_documents = [
|
||||
('index', 'ManilaUIReleaseNotes.tex',
|
||||
u'manila-ui Release Notes Documentation',
|
||||
u'Manila Developers', 'manual'),
|
||||
'manila-ui Release Notes Documentation',
|
||||
'Manila Developers', 'manual'),
|
||||
]
|
||||
|
||||
# The name of an image file (relative to this directory) to place at the top of
|
||||
|
@ -239,8 +239,8 @@ latex_documents = [
|
|||
# (source start file, name, description, authors, manual section).
|
||||
man_pages = [
|
||||
('index', 'manilauireleasenotes',
|
||||
u'manila-ui Release Notes Documentation',
|
||||
[u'Manila Developers'], 1)
|
||||
'manila-ui Release Notes Documentation',
|
||||
['Manila Developers'], 1)
|
||||
]
|
||||
|
||||
# If true, show URL addresses after external links.
|
||||
|
@ -254,8 +254,8 @@ man_pages = [
|
|||
# dir menu entry, description, category)
|
||||
texinfo_documents = [
|
||||
('index', 'ManilaUIReleaseNotes',
|
||||
u'manila-ui Release Notes Documentation',
|
||||
u'Manila Developers', 'ManilaUIReleaseNotes',
|
||||
'manila-ui Release Notes Documentation',
|
||||
'Manila Developers', 'ManilaUIReleaseNotes',
|
||||
'One line description of project.',
|
||||
'Miscellaneous'),
|
||||
]
|
||||
|
|
Loading…
Reference in New Issue