From 17118e78a49cb71f57afdfbab2102e0e73ccbdb6 Mon Sep 17 00:00:00 2001 From: Sai Rahul Poruri Date: Fri, 6 Nov 2020 08:16:42 +0000 Subject: [PATCH] CLN : Remove u-string prefixes The u-string prefixes arent needed on python 3 modified: apptools/help/help_plugin/help_submenu_manager.py modified: apptools/logger/agent/tests/test_attachments.py modified: apptools/persistence/tests/test_state_pickler.py modified: apptools/preferences/tests/test_preferences_helper.py modified: setup.py --- .../help/help_plugin/help_submenu_manager.py | 8 ++++---- .../logger/agent/tests/test_attachments.py | 2 +- .../persistence/tests/test_state_pickler.py | 8 ++++---- .../tests/test_preferences_helper.py | 20 +++++++++---------- setup.py | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/apptools/help/help_plugin/help_submenu_manager.py b/apptools/help/help_plugin/help_submenu_manager.py index 494443120..aff0826bf 100644 --- a/apptools/help/help_plugin/help_submenu_manager.py +++ b/apptools/help/help_plugin/help_submenu_manager.py @@ -110,7 +110,7 @@ class DocumentsMenuManager(HelpSubmenuManager): # The menu manager's name (if the manager is a sub-menu, this is what its # label will be). - name = u'&Documents' + name = '&Documents' #### 'DocMenuManager' interface ########################################## @@ -151,7 +151,7 @@ class DemosMenuManager(HelpSubmenuManager): # The menu manager's name (if the manager is a sub-menu, this is what its # label will be). - name = u'D&emos' + name = 'D&emos' #### 'DemoMenuManager' interface ########################################## @@ -191,7 +191,7 @@ class ExamplesMenuManager(HelpSubmenuManager): # The menu manager's name (if the manager is a sub-menu, this is what its # label will be). - name = u'&Examples' + name = '&Examples' #### 'ExampleMenuManager' interface ########################################## @@ -236,7 +236,7 @@ class DownloadsMenuManager(HelpSubmenuManager): # The menu manager's name (if the manager is a sub-menu, this is what its # label will be). - name = u'&Downloads' + name = '&Downloads' #### 'DocMenuManager' interface ########################################## diff --git a/apptools/logger/agent/tests/test_attachments.py b/apptools/logger/agent/tests/test_attachments.py index 499499817..4e3ff6dec 100644 --- a/apptools/logger/agent/tests/test_attachments.py +++ b/apptools/logger/agent/tests/test_attachments.py @@ -22,7 +22,7 @@ def setUp(self): self.tmpfile = os.path.join(self.tmpdir, "dummy_file.txt") with io.open(self.tmpfile, 'w', encoding='utf8') as filehandle: - filehandle.write(u"Dummy data in dummy file for dummies") + filehandle.write("Dummy data in dummy file for dummies") def test_attaching_workspace(self): class DummyWorkspace(object): diff --git a/apptools/persistence/tests/test_state_pickler.py b/apptools/persistence/tests/test_state_pickler.py index 694979471..1330367a7 100644 --- a/apptools/persistence/tests/test_state_pickler.py +++ b/apptools/persistence/tests/test_state_pickler.py @@ -48,7 +48,7 @@ def __init__(self): self.c = complex(1.01234, 2.3) self.n = None self.s = 'String' - self.u = u'Unicode' + self.u = 'Unicode' self.inst = A() self.tuple = (1, 2, 'a', A()) self.list = [1, 1.1, 'a', 1j, self.inst] @@ -69,7 +69,7 @@ class TestTraits(HasTraits): c = Complex(complex(1.01234, 2.3)) n = Any s = Str('String') - u = Str(u'Unicode') + u = Str('Unicode') inst = Instance(A) tuple = Tuple list = List @@ -95,7 +95,7 @@ def set_object(self, obj): obj.b = True obj.i = 8 obj.s = 'string' - obj.u = u'unicode' + obj.u = 'unicode' obj.inst.a = 'b' obj.list[0] = 2 obj.tuple[-1].a = 't' @@ -334,7 +334,7 @@ def test_state_setter(self): # Rest are unchanged. self.assertEqual(t1.i, 7) self.assertEqual(t1.s, 'String') - self.assertEqual(t1.u, u'Unicode') + self.assertEqual(t1.u, 'Unicode') self.assertEqual(t1.inst.a, 'a') self.assertEqual(t1.list[0], 1) self.assertEqual(t1.tuple[-1].a, 'a') diff --git a/apptools/preferences/tests/test_preferences_helper.py b/apptools/preferences/tests/test_preferences_helper.py index 72037e46b..f1f0e5518 100644 --- a/apptools/preferences/tests/test_preferences_helper.py +++ b/apptools/preferences/tests/test_preferences_helper.py @@ -98,7 +98,7 @@ class AcmeUIPreferencesHelper(PreferencesHelper): self.assertEqual(50, helper.width) self.assertEqual(1.0, helper.ratio) self.assertTrue(helper.visible) - self.assertEqual(u'acme ui', helper.description) + self.assertEqual('acme ui', helper.description) self.assertEqual([1, 2, 3, 4], helper.offsets) self.assertEqual(['joe', 'fred', 'jane'], helper.names) @@ -150,7 +150,7 @@ class AcmeUIPreferencesHelper(PreferencesHelper): self.assertEqual(50, helper.width) self.assertEqual(1.0, helper.ratio) self.assertTrue(helper.visible) - self.assertEqual(u'acme ui', helper.description) + self.assertEqual('acme ui', helper.description) self.assertEqual([1, 2, 3, 4], helper.offsets) self.assertEqual(['joe', 'fred', 'jane'], helper.names) @@ -192,7 +192,7 @@ class AcmeUIPreferencesHelper(PreferencesHelper): width = Int(50) ratio = Float(1.0) visible = Bool(True) - description = Str(u'description') + description = Str('description') offsets = List(Int, [1, 2, 3, 4]) names = List(Str, ['joe', 'fred', 'jane']) @@ -203,7 +203,7 @@ class AcmeUIPreferencesHelper(PreferencesHelper): self.assertEqual(50, helper.width) self.assertEqual(1.0, helper.ratio) self.assertTrue(helper.visible) - self.assertEqual(u'description', helper.description) + self.assertEqual('description', helper.description) self.assertEqual([1, 2, 3, 4], helper.offsets) self.assertEqual(['joe', 'fred', 'jane'], helper.names) @@ -224,13 +224,13 @@ class AcmeUIPreferencesHelper(PreferencesHelper): width = Int(50) ratio = Float(1.0) visible = Bool(True) - description = Str(u'') + description = Str('') offsets = List(Int, [1, 2, 3, 4]) names = List(Str, ['joe', 'fred', 'jane']) helper = AcmeUIPreferencesHelper() - first_unicode_str = u'U\xdc\xf2ser' + first_unicode_str = 'U\xdc\xf2ser' first_utf8_str = 'U\xc3\x9c\xc3\xb2ser' original_description = helper.description @@ -238,7 +238,7 @@ class AcmeUIPreferencesHelper(PreferencesHelper): self.assertEqual(first_unicode_str, helper.description) - second_unicode_str = u'caf\xe9' + second_unicode_str = 'caf\xe9' second_utf8_str = 'caf\xc3\xa9' helper.description = second_unicode_str self.assertEqual(second_unicode_str, helper.description) @@ -252,7 +252,7 @@ class AcmeUIPreferencesHelper(PreferencesHelper): p = Preferences() p.load(tmp) self.assertEqual(second_unicode_str, p.get('acme.ui.description')) - self.assertEqual(u'True', p.get('acme.ui.visible')) + self.assertEqual('True', p.get('acme.ui.visible')) self.assertTrue(helper.visible) def test_no_preferences_path(self): @@ -313,7 +313,7 @@ class AcmeUIPreferencesHelper(PreferencesHelper): self.assertEqual(50, helper.width) self.assertEqual(1.0, helper.ratio) self.assertTrue(helper.visible) - self.assertEqual(u'acme ui', helper.description) + self.assertEqual('acme ui', helper.description) self.assertEqual([1, 2, 3, 4], helper.offsets) self.assertEqual(['joe', 'fred', 'jane'], helper.names) @@ -497,7 +497,7 @@ def _width_changed(self, trait_name, old, new): self.assertEqual(50, helper.width) self.assertEqual(1.0, helper.ratio) self.assertTrue(helper.visible) - self.assertEqual(u'acme ui', helper.description) + self.assertEqual('acme ui', helper.description) self.assertEqual([1, 2, 3, 4], helper.offsets) self.assertEqual(['joe', 'fred', 'jane'], helper.names) diff --git a/setup.py b/setup.py index 7691817ad..b3d670b23 100644 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ GIT_DIRECTORY = os.path.join(HERE, ".git") # Template for the autogenerated version file. -VERSION_FILE_TEMPLATE = u'''\ +VERSION_FILE_TEMPLATE = '''\ # (C) Copyright 2008-2020 Enthought, Inc., Austin, TX # All rights reserved. #