From ede65d09d0b249b87bd911d0dbde69350885ed86 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sat, 13 Oct 2018 19:43:17 +0200 Subject: [PATCH] Clean up with 2to3 --- .../migrations/0016_auto_20180925_1735.py | 2 +- evennia/locks/tests.py | 182 +++++++++--------- evennia/server/sessionhandler.py | 2 +- evennia/typeclasses/tests.py | 34 ++-- evennia/utils/tests/test_evform.py | 82 ++++---- evennia/utils/utils.py | 4 +- 6 files changed, 153 insertions(+), 153 deletions(-) diff --git a/evennia/comms/migrations/0016_auto_20180925_1735.py b/evennia/comms/migrations/0016_auto_20180925_1735.py index cd4588843f..5158e1f61d 100644 --- a/evennia/comms/migrations/0016_auto_20180925_1735.py +++ b/evennia/comms/migrations/0016_auto_20180925_1735.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2018-09-25 17:35 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/evennia/locks/tests.py b/evennia/locks/tests.py index e2cac85789..9114a68060 100644 --- a/evennia/locks/tests.py +++ b/evennia/locks/tests.py @@ -45,145 +45,145 @@ class TestLockfuncs(EvenniaTest): self.char2.permissions.add('Builder') def test_booleans(self): - self.assertEquals(True, lockfuncs.true(self.account2, self.obj1)) - self.assertEquals(True, lockfuncs.all(self.account2, self.obj1)) - self.assertEquals(False, lockfuncs.false(self.account2, self.obj1)) - self.assertEquals(False, lockfuncs.none(self.account2, self.obj1)) - self.assertEquals(True, lockfuncs.self(self.obj1, self.obj1)) - self.assertEquals(True, lockfuncs.self(self.account, self.account)) - self.assertEquals(False, lockfuncs.superuser(self.account, None)) + self.assertEqual(True, lockfuncs.true(self.account2, self.obj1)) + self.assertEqual(True, lockfuncs.all(self.account2, self.obj1)) + self.assertEqual(False, lockfuncs.false(self.account2, self.obj1)) + self.assertEqual(False, lockfuncs.none(self.account2, self.obj1)) + self.assertEqual(True, lockfuncs.self(self.obj1, self.obj1)) + self.assertEqual(True, lockfuncs.self(self.account, self.account)) + self.assertEqual(False, lockfuncs.superuser(self.account, None)) @override_settings(PERMISSION_HIERARCHY=settings_default.PERMISSION_HIERARCHY) def test_account_perm(self): - self.assertEquals(False, lockfuncs.perm(self.account2, None, 'foo')) - self.assertEquals(False, lockfuncs.perm(self.account2, None, 'Developer')) - self.assertEquals(False, lockfuncs.perm(self.account2, None, 'Developers')) - self.assertEquals(True, lockfuncs.perm(self.account2, None, 'Admin')) - self.assertEquals(True, lockfuncs.perm(self.account2, None, 'Admins')) - self.assertEquals(True, lockfuncs.perm(self.account2, None, 'Player')) - self.assertEquals(True, lockfuncs.perm(self.account2, None, 'Players')) - self.assertEquals(True, lockfuncs.perm(self.account2, None, 'Builder')) - self.assertEquals(True, lockfuncs.perm(self.account2, None, 'Builders')) - self.assertEquals(True, lockfuncs.perm_above(self.account2, None, 'Builder')) + self.assertEqual(False, lockfuncs.perm(self.account2, None, 'foo')) + self.assertEqual(False, lockfuncs.perm(self.account2, None, 'Developer')) + self.assertEqual(False, lockfuncs.perm(self.account2, None, 'Developers')) + self.assertEqual(True, lockfuncs.perm(self.account2, None, 'Admin')) + self.assertEqual(True, lockfuncs.perm(self.account2, None, 'Admins')) + self.assertEqual(True, lockfuncs.perm(self.account2, None, 'Player')) + self.assertEqual(True, lockfuncs.perm(self.account2, None, 'Players')) + self.assertEqual(True, lockfuncs.perm(self.account2, None, 'Builder')) + self.assertEqual(True, lockfuncs.perm(self.account2, None, 'Builders')) + self.assertEqual(True, lockfuncs.perm_above(self.account2, None, 'Builder')) @override_settings(PERMISSION_HIERARCHY=settings_default.PERMISSION_HIERARCHY) def test_puppet_perm(self): - self.assertEquals(False, lockfuncs.perm(self.char2, None, 'foo')) - self.assertEquals(False, lockfuncs.perm(self.char2, None, 'Developer')) - self.assertEquals(False, lockfuncs.perm(self.char2, None, 'Develoeprs')) - self.assertEquals(True, lockfuncs.perm(self.char2, None, 'Admin')) - self.assertEquals(True, lockfuncs.perm(self.char2, None, 'Admins')) - self.assertEquals(True, lockfuncs.perm(self.char2, None, 'Player')) - self.assertEquals(True, lockfuncs.perm(self.char2, None, 'Players')) - self.assertEquals(True, lockfuncs.perm(self.char2, None, 'Builder')) - self.assertEquals(True, lockfuncs.perm(self.char2, None, 'Builders')) + self.assertEqual(False, lockfuncs.perm(self.char2, None, 'foo')) + self.assertEqual(False, lockfuncs.perm(self.char2, None, 'Developer')) + self.assertEqual(False, lockfuncs.perm(self.char2, None, 'Develoeprs')) + self.assertEqual(True, lockfuncs.perm(self.char2, None, 'Admin')) + self.assertEqual(True, lockfuncs.perm(self.char2, None, 'Admins')) + self.assertEqual(True, lockfuncs.perm(self.char2, None, 'Player')) + self.assertEqual(True, lockfuncs.perm(self.char2, None, 'Players')) + self.assertEqual(True, lockfuncs.perm(self.char2, None, 'Builder')) + self.assertEqual(True, lockfuncs.perm(self.char2, None, 'Builders')) @override_settings(PERMISSION_HIERARCHY=settings_default.PERMISSION_HIERARCHY) def test_account_perm_above(self): - self.assertEquals(True, lockfuncs.perm_above(self.char2, None, 'Builder')) - self.assertEquals(True, lockfuncs.perm_above(self.char2, None, 'Builders')) - self.assertEquals(True, lockfuncs.perm_above(self.char2, None, 'Player')) - self.assertEquals(False, lockfuncs.perm_above(self.char2, None, 'Admin')) - self.assertEquals(False, lockfuncs.perm_above(self.char2, None, 'Admins')) - self.assertEquals(False, lockfuncs.perm_above(self.char2, None, 'Developers')) + self.assertEqual(True, lockfuncs.perm_above(self.char2, None, 'Builder')) + self.assertEqual(True, lockfuncs.perm_above(self.char2, None, 'Builders')) + self.assertEqual(True, lockfuncs.perm_above(self.char2, None, 'Player')) + self.assertEqual(False, lockfuncs.perm_above(self.char2, None, 'Admin')) + self.assertEqual(False, lockfuncs.perm_above(self.char2, None, 'Admins')) + self.assertEqual(False, lockfuncs.perm_above(self.char2, None, 'Developers')) @override_settings(PERMISSION_HIERARCHY=settings_default.PERMISSION_HIERARCHY) def test_quell_perm(self): self.account2.db._quell = True - self.assertEquals(False, lockfuncs.false(self.char2, None)) - self.assertEquals(False, lockfuncs.perm(self.char2, None, 'Developer')) - self.assertEquals(False, lockfuncs.perm(self.char2, None, 'Developers')) - self.assertEquals(False, lockfuncs.perm(self.char2, None, 'Admin')) - self.assertEquals(False, lockfuncs.perm(self.char2, None, 'Admins')) - self.assertEquals(True, lockfuncs.perm(self.char2, None, 'Player')) - self.assertEquals(True, lockfuncs.perm(self.char2, None, 'Players')) - self.assertEquals(True, lockfuncs.perm(self.char2, None, 'Builder')) - self.assertEquals(True, lockfuncs.perm(self.char2, None, 'Builders')) + self.assertEqual(False, lockfuncs.false(self.char2, None)) + self.assertEqual(False, lockfuncs.perm(self.char2, None, 'Developer')) + self.assertEqual(False, lockfuncs.perm(self.char2, None, 'Developers')) + self.assertEqual(False, lockfuncs.perm(self.char2, None, 'Admin')) + self.assertEqual(False, lockfuncs.perm(self.char2, None, 'Admins')) + self.assertEqual(True, lockfuncs.perm(self.char2, None, 'Player')) + self.assertEqual(True, lockfuncs.perm(self.char2, None, 'Players')) + self.assertEqual(True, lockfuncs.perm(self.char2, None, 'Builder')) + self.assertEqual(True, lockfuncs.perm(self.char2, None, 'Builders')) @override_settings(PERMISSION_HIERARCHY=settings_default.PERMISSION_HIERARCHY) def test_quell_above_perm(self): - self.assertEquals(True, lockfuncs.perm_above(self.char2, None, 'Player')) - self.assertEquals(True, lockfuncs.perm_above(self.char2, None, 'Builder')) + self.assertEqual(True, lockfuncs.perm_above(self.char2, None, 'Player')) + self.assertEqual(True, lockfuncs.perm_above(self.char2, None, 'Builder')) @override_settings(PERMISSION_HIERARCHY=settings_default.PERMISSION_HIERARCHY) def test_object_perm(self): self.obj2.permissions.add('Admin') - self.assertEquals(False, lockfuncs.perm(self.obj2, None, 'Developer')) - self.assertEquals(False, lockfuncs.perm(self.obj2, None, 'Developers')) - self.assertEquals(True, lockfuncs.perm(self.obj2, None, 'Admin')) - self.assertEquals(True, lockfuncs.perm(self.obj2, None, 'Admins')) - self.assertEquals(True, lockfuncs.perm(self.obj2, None, 'Player')) - self.assertEquals(True, lockfuncs.perm(self.obj2, None, 'Players')) - self.assertEquals(True, lockfuncs.perm(self.obj2, None, 'Builder')) - self.assertEquals(True, lockfuncs.perm(self.obj2, None, 'Builders')) + self.assertEqual(False, lockfuncs.perm(self.obj2, None, 'Developer')) + self.assertEqual(False, lockfuncs.perm(self.obj2, None, 'Developers')) + self.assertEqual(True, lockfuncs.perm(self.obj2, None, 'Admin')) + self.assertEqual(True, lockfuncs.perm(self.obj2, None, 'Admins')) + self.assertEqual(True, lockfuncs.perm(self.obj2, None, 'Player')) + self.assertEqual(True, lockfuncs.perm(self.obj2, None, 'Players')) + self.assertEqual(True, lockfuncs.perm(self.obj2, None, 'Builder')) + self.assertEqual(True, lockfuncs.perm(self.obj2, None, 'Builders')) @override_settings(PERMISSION_HIERARCHY=settings_default.PERMISSION_HIERARCHY) def test_object_above_perm(self): self.obj2.permissions.add('Admin') - self.assertEquals(False, lockfuncs.perm_above(self.obj2, None, 'Admins')) - self.assertEquals(True, lockfuncs.perm_above(self.obj2, None, 'Builder')) - self.assertEquals(True, lockfuncs.perm_above(self.obj2, None, 'Builders')) + self.assertEqual(False, lockfuncs.perm_above(self.obj2, None, 'Admins')) + self.assertEqual(True, lockfuncs.perm_above(self.obj2, None, 'Builder')) + self.assertEqual(True, lockfuncs.perm_above(self.obj2, None, 'Builders')) @override_settings(PERMISSION_HIERARCHY=settings_default.PERMISSION_HIERARCHY) def test_pperm(self): self.obj2.permissions.add('Developer') self.char2.permissions.add('Developer') - self.assertEquals(False, lockfuncs.pperm(self.obj2, None, 'Players')) - self.assertEquals(True, lockfuncs.pperm(self.char2, None, 'Players')) - self.assertEquals(True, lockfuncs.pperm(self.account, None, 'Admins')) - self.assertEquals(True, lockfuncs.pperm_above(self.account, None, 'Builders')) - self.assertEquals(False, lockfuncs.pperm_above(self.account2, None, 'Admins')) - self.assertEquals(True, lockfuncs.pperm_above(self.char2, None, 'Players')) + self.assertEqual(False, lockfuncs.pperm(self.obj2, None, 'Players')) + self.assertEqual(True, lockfuncs.pperm(self.char2, None, 'Players')) + self.assertEqual(True, lockfuncs.pperm(self.account, None, 'Admins')) + self.assertEqual(True, lockfuncs.pperm_above(self.account, None, 'Builders')) + self.assertEqual(False, lockfuncs.pperm_above(self.account2, None, 'Admins')) + self.assertEqual(True, lockfuncs.pperm_above(self.char2, None, 'Players')) def test_dbref(self): dbref = self.obj2.dbref - self.assertEquals(True, lockfuncs.dbref(self.obj2, None, '%s' % dbref)) - self.assertEquals(False, lockfuncs.id(self.obj2, None, '%s' % (dbref + '1'))) + self.assertEqual(True, lockfuncs.dbref(self.obj2, None, '%s' % dbref)) + self.assertEqual(False, lockfuncs.id(self.obj2, None, '%s' % (dbref + '1'))) dbref = self.account2.dbref - self.assertEquals(True, lockfuncs.pdbref(self.account2, None, '%s' % dbref)) - self.assertEquals(False, lockfuncs.pid(self.account2, None, '%s' % (dbref + '1'))) + self.assertEqual(True, lockfuncs.pdbref(self.account2, None, '%s' % dbref)) + self.assertEqual(False, lockfuncs.pid(self.account2, None, '%s' % (dbref + '1'))) def test_attr(self): self.obj2.db.testattr = 45 - self.assertEquals(True, lockfuncs.attr(self.obj2, None, 'testattr', '45')) - self.assertEquals(False, lockfuncs.attr_gt(self.obj2, None, 'testattr', '45')) - self.assertEquals(True, lockfuncs.attr_ge(self.obj2, None, 'testattr', '45')) - self.assertEquals(False, lockfuncs.attr_lt(self.obj2, None, 'testattr', '45')) - self.assertEquals(True, lockfuncs.attr_le(self.obj2, None, 'testattr', '45')) + self.assertEqual(True, lockfuncs.attr(self.obj2, None, 'testattr', '45')) + self.assertEqual(False, lockfuncs.attr_gt(self.obj2, None, 'testattr', '45')) + self.assertEqual(True, lockfuncs.attr_ge(self.obj2, None, 'testattr', '45')) + self.assertEqual(False, lockfuncs.attr_lt(self.obj2, None, 'testattr', '45')) + self.assertEqual(True, lockfuncs.attr_le(self.obj2, None, 'testattr', '45')) - self.assertEquals(True, lockfuncs.objattr(None, self.obj2, 'testattr', '45')) - self.assertEquals(True, lockfuncs.objattr(None, self.obj2, 'testattr', '45')) - self.assertEquals(False, lockfuncs.objattr(None, self.obj2, 'testattr', '45', compare='lt')) + self.assertEqual(True, lockfuncs.objattr(None, self.obj2, 'testattr', '45')) + self.assertEqual(True, lockfuncs.objattr(None, self.obj2, 'testattr', '45')) + self.assertEqual(False, lockfuncs.objattr(None, self.obj2, 'testattr', '45', compare='lt')) def test_locattr(self): self.obj2.location.db.locattr = 'test' - self.assertEquals(True, lockfuncs.locattr(self.obj2, None, 'locattr', 'test')) - self.assertEquals(False, lockfuncs.locattr(self.obj2, None, 'fail', 'testfail')) - self.assertEquals(True, lockfuncs.objlocattr(None, self.obj2, 'locattr', 'test')) + self.assertEqual(True, lockfuncs.locattr(self.obj2, None, 'locattr', 'test')) + self.assertEqual(False, lockfuncs.locattr(self.obj2, None, 'fail', 'testfail')) + self.assertEqual(True, lockfuncs.objlocattr(None, self.obj2, 'locattr', 'test')) def test_tag(self): self.obj2.tags.add("test1") self.obj2.tags.add("test2", "category1") - self.assertEquals(True, lockfuncs.tag(self.obj2, None, 'test1')) - self.assertEquals(True, lockfuncs.tag(self.obj2, None, 'test2', 'category1')) - self.assertEquals(False, lockfuncs.tag(self.obj2, None, 'test1', 'category1')) - self.assertEquals(False, lockfuncs.tag(self.obj2, None, 'test1', 'category2')) - self.assertEquals(True, lockfuncs.objtag(None, self.obj2, 'test2', 'category1')) - self.assertEquals(False, lockfuncs.objtag(None, self.obj2, 'test2')) + self.assertEqual(True, lockfuncs.tag(self.obj2, None, 'test1')) + self.assertEqual(True, lockfuncs.tag(self.obj2, None, 'test2', 'category1')) + self.assertEqual(False, lockfuncs.tag(self.obj2, None, 'test1', 'category1')) + self.assertEqual(False, lockfuncs.tag(self.obj2, None, 'test1', 'category2')) + self.assertEqual(True, lockfuncs.objtag(None, self.obj2, 'test2', 'category1')) + self.assertEqual(False, lockfuncs.objtag(None, self.obj2, 'test2')) def test_inside_holds(self): - self.assertEquals(True, lockfuncs.inside(self.char1, self.room1)) - self.assertEquals(False, lockfuncs.inside(self.char1, self.room2)) - self.assertEquals(True, lockfuncs.holds(self.room1, self.char1)) - self.assertEquals(False, lockfuncs.holds(self.room2, self.char1)) + self.assertEqual(True, lockfuncs.inside(self.char1, self.room1)) + self.assertEqual(False, lockfuncs.inside(self.char1, self.room2)) + self.assertEqual(True, lockfuncs.holds(self.room1, self.char1)) + self.assertEqual(False, lockfuncs.holds(self.room2, self.char1)) def test_has_account(self): - self.assertEquals(True, lockfuncs.has_account(self.char1, None)) - self.assertEquals(False, lockfuncs.has_account(self.obj1, None)) + self.assertEqual(True, lockfuncs.has_account(self.char1, None)) + self.assertEqual(False, lockfuncs.has_account(self.obj1, None)) @override_settings(IRC_ENABLED=True, TESTVAL=[1, 2, 3]) def test_serversetting(self): - self.assertEquals(True, lockfuncs.serversetting(None, None, 'IRC_ENABLED', 'True')) - self.assertEquals(True, lockfuncs.serversetting(None, None, 'TESTVAL', '[1, 2, 3]')) - self.assertEquals(False, lockfuncs.serversetting(None, None, 'TESTVAL', '[1, 2, 4]')) - self.assertEquals(False, lockfuncs.serversetting(None, None, 'TESTVAL', '123')) + self.assertEqual(True, lockfuncs.serversetting(None, None, 'IRC_ENABLED', 'True')) + self.assertEqual(True, lockfuncs.serversetting(None, None, 'TESTVAL', '[1, 2, 3]')) + self.assertEqual(False, lockfuncs.serversetting(None, None, 'TESTVAL', '[1, 2, 4]')) + self.assertEqual(False, lockfuncs.serversetting(None, None, 'TESTVAL', '123')) diff --git a/evennia/server/sessionhandler.py b/evennia/server/sessionhandler.py index aa683acb28..9ff37b15d3 100644 --- a/evennia/server/sessionhandler.py +++ b/evennia/server/sessionhandler.py @@ -214,7 +214,7 @@ class SessionHandler(dict): return newdict elif is_iter(data): return [_validate(part) for part in data] - elif isinstance(data, (str, bytes, )): + elif isinstance(data, (str, bytes )): data = _utf8(data) if _INLINEFUNC_ENABLED and not raw and isinstance(self, ServerSessionHandler): diff --git a/evennia/typeclasses/tests.py b/evennia/typeclasses/tests.py index b4a2361aae..09df228dee 100644 --- a/evennia/typeclasses/tests.py +++ b/evennia/typeclasses/tests.py @@ -24,13 +24,13 @@ class TestTypedObjectManager(EvenniaTest): self.obj2.tags.add("tag3 with spaces") self.obj2.tags.add("tag4") self.obj2.tags.add("tag2c") - self.assertEquals(self._manager("get_by_tag", "tag1"), [self.obj1]) - self.assertEquals(self._manager("get_by_tag", "tag2"), [self.obj1, self.obj2]) - self.assertEquals(self._manager("get_by_tag", "tag2a"), [self.obj2]) - self.assertEquals(self._manager("get_by_tag", "tag3 with spaces"), [self.obj2]) - self.assertEquals(self._manager("get_by_tag", ["tag2a", "tag2b"]), [self.obj2]) - self.assertEquals(self._manager("get_by_tag", ["tag2a", "tag1"]), []) - self.assertEquals(self._manager("get_by_tag", ["tag2a", "tag4", "tag2c"]), [self.obj2]) + self.assertEqual(self._manager("get_by_tag", "tag1"), [self.obj1]) + self.assertEqual(self._manager("get_by_tag", "tag2"), [self.obj1, self.obj2]) + self.assertEqual(self._manager("get_by_tag", "tag2a"), [self.obj2]) + self.assertEqual(self._manager("get_by_tag", "tag3 with spaces"), [self.obj2]) + self.assertEqual(self._manager("get_by_tag", ["tag2a", "tag2b"]), [self.obj2]) + self.assertEqual(self._manager("get_by_tag", ["tag2a", "tag1"]), []) + self.assertEqual(self._manager("get_by_tag", ["tag2a", "tag4", "tag2c"]), [self.obj2]) def test_get_by_tag_and_category(self): self.obj1.tags.add("tag5", "category1") @@ -43,17 +43,17 @@ class TestTypedObjectManager(EvenniaTest): self.obj2.tags.add("tag6", "category3") self.obj2.tags.add("tag7", "category1") self.obj2.tags.add("tag7", "category5") - self.assertEquals(self._manager("get_by_tag", "tag5", "category1"), [self.obj1, self.obj2]) - self.assertEquals(self._manager("get_by_tag", "tag6", "category1"), []) - self.assertEquals(self._manager("get_by_tag", "tag6", "category3"), [self.obj1, self.obj2]) - self.assertEquals(self._manager("get_by_tag", ["tag5", "tag6"], + self.assertEqual(self._manager("get_by_tag", "tag5", "category1"), [self.obj1, self.obj2]) + self.assertEqual(self._manager("get_by_tag", "tag6", "category1"), []) + self.assertEqual(self._manager("get_by_tag", "tag6", "category3"), [self.obj1, self.obj2]) + self.assertEqual(self._manager("get_by_tag", ["tag5", "tag6"], ["category1", "category3"]), [self.obj1, self.obj2]) - self.assertEquals(self._manager("get_by_tag", ["tag5", "tag7"], + self.assertEqual(self._manager("get_by_tag", ["tag5", "tag7"], "category1"), [self.obj1, self.obj2]) - self.assertEquals(self._manager("get_by_tag", category="category1"), [self.obj1, self.obj2]) - self.assertEquals(self._manager("get_by_tag", category="category2"), [self.obj2]) - self.assertEquals(self._manager("get_by_tag", category=["category1", "category3"]), + self.assertEqual(self._manager("get_by_tag", category="category1"), [self.obj1, self.obj2]) + self.assertEqual(self._manager("get_by_tag", category="category2"), [self.obj2]) + self.assertEqual(self._manager("get_by_tag", category=["category1", "category3"]), [self.obj1, self.obj2]) - self.assertEquals(self._manager("get_by_tag", category=["category1", "category2"]), + self.assertEqual(self._manager("get_by_tag", category=["category1", "category2"]), [self.obj2]) - self.assertEquals(self._manager("get_by_tag", category=["category5", "category4"]), []) + self.assertEqual(self._manager("get_by_tag", category=["category5", "category4"]), []) diff --git a/evennia/utils/tests/test_evform.py b/evennia/utils/tests/test_evform.py index 923972d27a..99df7ecb7e 100644 --- a/evennia/utils/tests/test_evform.py +++ b/evennia/utils/tests/test_evform.py @@ -10,47 +10,47 @@ class TestEvForm(TestCase): def test_form(self): self.maxDiff = None self.assertEqual(evform._test(), - u'.------------------------------------------------.\n' - u'| |\n' - u'| Name: \x1b[0m\x1b[1m\x1b[32mTom\x1b[1m\x1b[32m \x1b' - u'[1m\x1b[32mthe\x1b[1m\x1b[32m \x1b[0m \x1b[0m ' - u'Account: \x1b[0m\x1b[1m\x1b[33mGriatch ' - u'\x1b[0m\x1b[0m\x1b[1m\x1b[32m\x1b[1m\x1b[32m\x1b[1m\x1b[32m\x1b[1m\x1b[32m\x1b[0m\x1b[0m ' - u'|\n' - u'| \x1b[0m\x1b[1m\x1b[32mBouncer\x1b[0m \x1b[0m |\n' - u'| |\n' - u' >----------------------------------------------< \n' - u'| |\n' - u'| Desc: \x1b[0mA sturdy \x1b[0m \x1b[0m' - u' STR: \x1b[0m12 \x1b[0m\x1b[0m\x1b[0m\x1b[0m' - u' DEX: \x1b[0m10 \x1b[0m\x1b[0m\x1b[0m\x1b[0m |\n' - u'| \x1b[0mfellow\x1b[0m \x1b[0m' - u' INT: \x1b[0m5 \x1b[0m\x1b[0m\x1b[0m\x1b[0m' - u' STA: \x1b[0m18 \x1b[0m\x1b[0m\x1b[0m\x1b[0m |\n' - u'| \x1b[0m \x1b[0m' - u' LUC: \x1b[0m10 \x1b[0m\x1b[0m\x1b[0m' - u' MAG: \x1b[0m3 \x1b[0m\x1b[0m\x1b[0m |\n' - u'| |\n' - u' >----------.-----------------------------------< \n' - u'| | |\n' - u'| \x1b[0mHP\x1b[0m|\x1b[0mMV \x1b[0m|\x1b[0mMP\x1b[0m ' - u'| \x1b[0mSkill \x1b[0m|\x1b[0mValue \x1b[0m' - u'|\x1b[0mExp \x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m |\n' - u'| ~~+~~~+~~ | ~~~~~~~~~~~+~~~~~~~~~~+~~~~~~~~~~~ |\n' - u'| \x1b[0m**\x1b[0m|\x1b[0m***\x1b[0m\x1b[0m|\x1b[0m**\x1b[0m\x1b[0m ' - u'| \x1b[0mShooting \x1b[0m|\x1b[0m12 \x1b[0m' - u'|\x1b[0m550/1200 \x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m |\n' - u'| \x1b[0m \x1b[0m|\x1b[0m**\x1b[0m \x1b[0m|\x1b[0m*\x1b[0m \x1b[0m ' - u'| \x1b[0mHerbalism \x1b[0m|\x1b[0m14 \x1b[0m' - u'|\x1b[0m990/1400 \x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m |\n' - u'| \x1b[0m \x1b[0m|\x1b[0m \x1b[0m|\x1b[0m \x1b[0m ' - u'| \x1b[0mSmithing \x1b[0m|\x1b[0m9 \x1b[0m' - u'|\x1b[0m205/900 \x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m |\n' - u'| | |\n' - u' -----------`-------------------------------------\n' - u' Footer: \x1b[0mrev 1 \x1b[0m \n' - u' info \n' - u' ') + '.------------------------------------------------.\n' + '| |\n' + '| Name: \x1b[0m\x1b[1m\x1b[32mTom\x1b[1m\x1b[32m \x1b' + '[1m\x1b[32mthe\x1b[1m\x1b[32m \x1b[0m \x1b[0m ' + 'Account: \x1b[0m\x1b[1m\x1b[33mGriatch ' + '\x1b[0m\x1b[0m\x1b[1m\x1b[32m\x1b[1m\x1b[32m\x1b[1m\x1b[32m\x1b[1m\x1b[32m\x1b[0m\x1b[0m ' + '|\n' + '| \x1b[0m\x1b[1m\x1b[32mBouncer\x1b[0m \x1b[0m |\n' + '| |\n' + ' >----------------------------------------------< \n' + '| |\n' + '| Desc: \x1b[0mA sturdy \x1b[0m \x1b[0m' + ' STR: \x1b[0m12 \x1b[0m\x1b[0m\x1b[0m\x1b[0m' + ' DEX: \x1b[0m10 \x1b[0m\x1b[0m\x1b[0m\x1b[0m |\n' + '| \x1b[0mfellow\x1b[0m \x1b[0m' + ' INT: \x1b[0m5 \x1b[0m\x1b[0m\x1b[0m\x1b[0m' + ' STA: \x1b[0m18 \x1b[0m\x1b[0m\x1b[0m\x1b[0m |\n' + '| \x1b[0m \x1b[0m' + ' LUC: \x1b[0m10 \x1b[0m\x1b[0m\x1b[0m' + ' MAG: \x1b[0m3 \x1b[0m\x1b[0m\x1b[0m |\n' + '| |\n' + ' >----------.-----------------------------------< \n' + '| | |\n' + '| \x1b[0mHP\x1b[0m|\x1b[0mMV \x1b[0m|\x1b[0mMP\x1b[0m ' + '| \x1b[0mSkill \x1b[0m|\x1b[0mValue \x1b[0m' + '|\x1b[0mExp \x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m |\n' + '| ~~+~~~+~~ | ~~~~~~~~~~~+~~~~~~~~~~+~~~~~~~~~~~ |\n' + '| \x1b[0m**\x1b[0m|\x1b[0m***\x1b[0m\x1b[0m|\x1b[0m**\x1b[0m\x1b[0m ' + '| \x1b[0mShooting \x1b[0m|\x1b[0m12 \x1b[0m' + '|\x1b[0m550/1200 \x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m |\n' + '| \x1b[0m \x1b[0m|\x1b[0m**\x1b[0m \x1b[0m|\x1b[0m*\x1b[0m \x1b[0m ' + '| \x1b[0mHerbalism \x1b[0m|\x1b[0m14 \x1b[0m' + '|\x1b[0m990/1400 \x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m |\n' + '| \x1b[0m \x1b[0m|\x1b[0m \x1b[0m|\x1b[0m \x1b[0m ' + '| \x1b[0mSmithing \x1b[0m|\x1b[0m9 \x1b[0m' + '|\x1b[0m205/900 \x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m |\n' + '| | |\n' + ' -----------`-------------------------------------\n' + ' Footer: \x1b[0mrev 1 \x1b[0m \n' + ' info \n' + ' ') def test_ansi_escape(self): # note that in a msg() call, the result would be the correct |-----, diff --git a/evennia/utils/utils.py b/evennia/utils/utils.py index 334c323280..c83a1a0a5a 100644 --- a/evennia/utils/utils.py +++ b/evennia/utils/utils.py @@ -56,7 +56,7 @@ def is_iter(obj): what we want to do with a string. """ - if isinstance(obj, (str, bytes, )): + if isinstance(obj, (str, bytes )): return False try: @@ -800,7 +800,7 @@ def to_str(obj, encoding='utf-8', force_string=False): conversion of objects to strings. """ - if isinstance(obj, (str, bytes, )): + if isinstance(obj, (str, bytes )): return obj if force_string: