Mercurial > openrpg
changeset 531:9e83dcf6358f
merge
| author | Digitalxero |
|---|---|
| date | Mon, 22 Mar 2010 23:38:14 -0600 |
| parents | 54d234728df4 (current diff) 0aa5bf0cf814 (diff) |
| children | 63b7f7839475 |
| files | orpg/networking/mplay_client.py orpg/networking/mplay_server.py orpg/tests/conftest.py orpg/tests/test_dieroller.py |
| diffstat | 4 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/orpg/networking/mplay_client.py Mon Mar 22 18:28:17 2010 -0600 +++ b/orpg/networking/mplay_client.py Mon Mar 22 23:38:14 2010 -0600 @@ -720,6 +720,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 18:28:17 2010 -0600 +++ b/orpg/networking/mplay_server.py Mon Mar 22 23:38:14 2010 -0600 @@ -1042,7 +1042,7 @@ def broadcast(self,msg): - self.send_to_all("0","<msg to='all' from='0' group_id='1'><font color='#FF0000'>" + msg + "</font>") + self.send_to_all("0","<msg to='all' from='0' group_id='1'/><font color='#FF0000'>" + msg + "</font>") def console_log(self): @@ -1441,7 +1441,7 @@ # See if we have a server name to report! - if len(self.serverName): + if self.serverName: lobbyMsg += ", named '" + self.serverName + "'." else: @@ -1726,7 +1726,7 @@ #because a time was sent return a ping response msg ="<ping time='" + str(sent_time) + "' />" else: - msg ="<msg to='" + player + "' from='" + player + "' group_id='" + group_id + "'><font color='#FF0000'>PONG!?!</font>" + msg ="<msg to='" + player + "' from='" + player + "' group_id='" + group_id + "'/><font color='#FF0000'>PONG!?!</font>" self.players[player].outbox.put(msg) xml_dom.unlink()
--- a/orpg/tests/conftest.py Mon Mar 22 18:28:17 2010 -0600 +++ b/orpg/tests/conftest.py Mon Mar 22 23:38:14 2010 -0600 @@ -60,7 +60,7 @@ validate = request.getfuncargvalue('validate') settings = request.getfuncargvalue('settings') - mainapp = orpg.main.orpgApp(0) + mainapp = orpgApp(0) open_rpg.add_component('log', logger) open_rpg.add_component('xml', orpg.orpg_xml) open_rpg.add_component('dir_struct', dir_struct) @@ -68,7 +68,6 @@ open_rpg.add_component('validate', validate) open_rpg.add_component('settings', settings) - mainapp = orpg.main.orpgApp(0) frame = orpgFrame(None, -1, CLIENT_STRING) frame.Raise() frame.Refresh() @@ -81,4 +80,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 18:28:17 2010 -0600 +++ b/orpg/tests/test_dieroller.py Mon Mar 22 23:38:14 2010 -0600 @@ -1,7 +1,7 @@ import py py.test.importorskip("orpg") -py.test.importorskip("orpg.dieroller.utils") +py.test.importorskip("orpg.dieroller.rollers") def pytest_generate_tests(metafunc): # called once per each test function @@ -57,4 +57,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