Mercurial > openrpg
changeset 537:63b7f7839475
merge
| author | digitalxero |
|---|---|
| date | Mon, 22 Mar 2010 23:41:45 -0600 |
| parents | 5f38cd163edf (current diff) 9e83dcf6358f (diff) |
| children | 4652c82bf351 |
| files | orpg/networking/mplay_client.py orpg/networking/mplay_server.py orpg/tests/conftest.py orpg/tests/test_dieroller.py |
| diffstat | 4 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/orpg/networking/mplay_client.py Mon Mar 22 23:30:27 2010 -0600 +++ b/orpg/networking/mplay_client.py Mon Mar 22 23:41:45 2010 -0600 @@ -686,6 +686,8 @@ chat = self.get_chat() chat.sound_player.play(etreeEl.get('url'), 'remote', etreeEl.get('loop')) + if not msg.startswith('<'): + msg = msg.replace('<', '<').replace('>', '>') def on_msg(self, id, etreeEl): if id == "0":
--- a/orpg/networking/mplay_server.py Mon Mar 22 23:30:27 2010 -0600 +++ b/orpg/networking/mplay_server.py Mon Mar 22 23:41:45 2010 -0600 @@ -1373,7 +1373,7 @@ # See if we have a server name to report! - if len(self.serverName): + if self.serverName: lobbyMsg += ", named '" + self.serverName + "'." else:
--- a/orpg/tests/conftest.py Mon Mar 22 23:30:27 2010 -0600 +++ b/orpg/tests/conftest.py Mon Mar 22 23:41:45 2010 -0600 @@ -78,4 +78,4 @@ client.kill_mplay_session() client.closed_confirmed() - return request.cached_setup(setup=setup, teardown=teardown, scope="session") \ No newline at end of file + return request.cached_setup(setup=setup, teardown=teardown, scope="session")
--- a/orpg/tests/test_dieroller.py Mon Mar 22 23:30:27 2010 -0600 +++ b/orpg/tests/test_dieroller.py Mon Mar 22 23:41:45 2010 -0600 @@ -1,7 +1,7 @@ import py py.test.importorskip("orpg") - +py.test.importorskip("orpg.dieroller.rollers") from orpg.dieroller import roller_manager def pytest_generate_tests(metafunc): @@ -58,4 +58,4 @@ #assert r[0] >= min_roll and r[0] <= max_roll #assert r[1] == extra #else: - #assert r >= min_roll and r <= max_roll \ No newline at end of file + #assert r >= min_roll and r <= max_roll