Mercurial > openrpg
changeset 534:e55283b9b2de
All depreciation errors are gone with the client, now just to test and make sure it works with the server
| author | digitalxero |
|---|---|
| date | Mon, 22 Mar 2010 19:33:06 -0600 |
| parents | 38eaf9f14f3e |
| children | e4b5be14a8ea |
| files | orpg/dieroller/_base.py orpg/dieroller/base.py orpg/gametree/nodehandlers/core.py orpg/main.py orpg/mapper/base.py orpg/minidom.py orpg/networking/gsclient.py orpg/networking/meta_server_lib.py orpg/orpgCore.py orpg/orpg_windows.py orpg/pluginhandler.py orpg/tests/conftest.py orpg/tests/test_dieroller.py orpg/tools/scriptkit.py |
| diffstat | 14 files changed, 53 insertions(+), 73 deletions(-) [+] |
line wrap: on
line diff
--- a/orpg/dieroller/_base.py Mon Mar 22 18:38:22 2010 -0600 +++ b/orpg/dieroller/_base.py Mon Mar 22 19:33:06 2010 -0600 @@ -10,7 +10,7 @@ StringEnd, alphanums, OneOrMore, Group, ParseException) from orpg.tools.orpg_log import logger -from orpg.tools.decorators import deprecated +from orpg.tools.decorators import pending_deprecation __all__ = ['BaseRoller', 'die_rollers', 'roller_manager'] @@ -215,6 +215,7 @@ return it def register(self, roller): + print roller if not self._rollers.has_key(roller.name): if not isinstance(roller, BaseRoller) and\ isinstance(roller(), BaseRoller): @@ -230,7 +231,8 @@ if isinstance(self._roller, BaseRoller): return self._roller(roll_string) else: - #Ok we are using an OLD roller, so have fun with eval and shit + #Ok we are using an OLD roller, + #so have fun with eval and shit return self.proccessRoll(roll_string) except Exception: logger.exception(traceback.format_exc()) @@ -239,6 +241,9 @@ print "Roll Time:", time.time()-st def _get_roller(self): + if self._roller: + self._roller = self._rollers['std'] + return self._roller.name def _set_roller(self, value): if not isinstance(value, basestring): @@ -256,19 +261,19 @@ def __getitem__(self, name): return self._rollers[name] - @deprecated("setRoller has been depreciated, use the roller property") + @pending_deprecation("setRoller has been depreciated, use the roller property") def setRoller(self, name): self.roller = name - @deprecated("getRoller has been depreciated, use the roller property") + @pending_deprecation("getRoller has been depreciated, use the roller property") def getRoller(self): return self.roller - @deprecated("listRollers has been depreciated, use the list method") + @pending_deprecation("listRollers has been depreciated, use the list method") def listRollers(self): return self.list() - @deprecated("stdDieToDClass has been depreciated, convert your roller to the new style") + @pending_deprecation("stdDieToDClass has been depreciated, convert your roller to the new style") def stdDieToDClass(self,match): s = match.group(0) (num,sides) = s.split('d') @@ -287,7 +292,7 @@ return ''.join(ret) # Use this to convert ndm-style (3d6) dice to d_base format - @deprecated("convertTheDieString has been depreciated, convert your roller to the new style") + @pending_deprecation("convertTheDieString has been depreciated, convert your roller to the new style") def convertTheDieString(self,s): reg = re.compile("(?:\d+|\([0-9\*/\-\+]+\))\s*[a-zA-Z]+\s*[\dFf]+") (result, num_matches) = reg.subn(self.stdDieToDClass, s) @@ -300,7 +305,7 @@ pass return result - @deprecated("proccessRoll has been depreciated, convert your roller to the new style") + @pending_deprecation("proccessRoll has been depreciated, convert your roller to the new style") def proccessRoll(self, s): qmode = 0 newstr1 = s @@ -336,11 +341,11 @@ cls.__it__ = it = object.__new__(cls) return it - @deprecated("Use roller_manager.list() instead") + @pending_deprecation("Use roller_manager.list() instead") def keys(self): return roller_manager.list() - @deprecated("Use roller_manager.register instead") + @pending_deprecation("Use roller_manager.register instead") def register(self, roller): roller_manager.register(roller)
--- a/orpg/dieroller/base.py Mon Mar 22 18:38:22 2010 -0600 +++ b/orpg/dieroller/base.py Mon Mar 22 19:33:06 2010 -0600 @@ -35,13 +35,13 @@ import copy #import string -from orpg.tools.decorators import deprecated +from orpg.tools.decorators import pending_deprecation from _base import die_rollers class die_base(UserList.UserList): name = None - @deprecated("Convert your die roller to the new style") + @pending_deprecation("Convert your die roller to the new style") def __init__(self,source = []): if isinstance(source, (int, float, basestring)): s = [] @@ -305,7 +305,7 @@ ### di class to handle actual dice class di: - @deprecated("Convert your die roller to the new style") + @pending_deprecation("Convert your die roller to the new style") def __init__(self,sides,min=1): self.sides = sides self.history = None @@ -441,7 +441,7 @@ return self.history[:] class static_di(di): - @deprecated("Convert your die roller to the new style") + @pending_deprecation("Convert your die roller to the new style") def __init__(self,value): di.__init__(self,value,value) self.set_value(value) \ No newline at end of file
--- a/orpg/gametree/nodehandlers/core.py Mon Mar 22 18:38:22 2010 -0600 +++ b/orpg/gametree/nodehandlers/core.py Mon Mar 22 19:33:06 2010 -0600 @@ -32,7 +32,6 @@ try: from orpg.orpg_windows import * import orpg.dirpath - from orpg.orpg_xml import * from orpg.orpgCore import open_rpg import webbrowser from orpg.mapper import map @@ -50,7 +49,7 @@ if elem.text is None: return '' return str(elem.text) - + def is_integer(string): return string is not None and (string.isdigit() or (string != '' and string[0] == '-' and string[1:].isdigit())) @@ -85,7 +84,7 @@ self.frame_size = (sx, sy) (maxx, maxy) = DisplaySize() if px < maxx-80 and py < maxy-50:#if it's off screen ignore the saved pos - self.frame_pos = (px, py) + self.frame_pos = (px, py) except: pass @@ -351,7 +350,7 @@ """ returns the integer value of the node (as a string) if it has one, or None this function is mostly used by the reference system and the bonus system """ return None - + P_TITLE = 10
--- a/orpg/main.py Mon Mar 22 18:38:22 2010 -0600 +++ b/orpg/main.py Mon Mar 22 19:33:06 2010 -0600 @@ -33,7 +33,6 @@ from orpg_version import * from orpg.orpg_windows import * -import orpg.orpg_xml import orpg.player_list import orpg.tools.pluginui as pluginUI import orpg.tools.aliaslib @@ -1230,7 +1229,6 @@ #Add the initial global components of the openrpg class #Every class should be passed openrpg open_rpg.add_component('log', logger) - open_rpg.add_component('xml', orpg.orpg_xml) open_rpg.add_component('dir_struct', dir_struct) open_rpg.add_component('tabbedWindows', []) open_rpg.add_component('validate', validate)
--- a/orpg/mapper/base.py Mon Mar 22 18:38:22 2010 -0600 +++ b/orpg/mapper/base.py Mon Mar 22 19:33:06 2010 -0600 @@ -30,7 +30,6 @@ from images import ImageHandler from orpg.tools.rgbhex import * from orpg.orpg_windows import * -from orpg.orpg_xml import * from math import * from threading import Lock import time
--- a/orpg/minidom.py Mon Mar 22 18:38:22 2010 -0600 +++ b/orpg/minidom.py Mon Mar 22 19:33:06 2010 -0600 @@ -16,7 +16,7 @@ import warnings warnings.warn("The minidom module will be depreciated in a future release", - DeprecationWarning, 2) + DeprecationWarning, 3) from orpg import pulldom import string
--- a/orpg/networking/gsclient.py Mon Mar 22 18:38:22 2010 -0600 +++ b/orpg/networking/gsclient.py Mon Mar 22 19:33:06 2010 -0600 @@ -32,7 +32,6 @@ import meta_server_lib from orpg.orpg_windows import * -from orpg.orpg_xml import * from orpg.chat.chat_util import strip_html, strip_unicode import orpg.tools.rgbhex from orpg.orpgCore import open_rpg
--- a/orpg/networking/meta_server_lib.py Mon Mar 22 18:38:22 2010 -0600 +++ b/orpg/networking/meta_server_lib.py Mon Mar 22 19:33:06 2010 -0600 @@ -43,8 +43,6 @@ from threading import * from orpg.orpg_version import PROTOCOL_VERSION -from orpg.orpg_xml import * -import orpg.minidom # WTF? from orpg.chat.chat_util import strip_html from orpg.dirpath import dir_struct from orpg.tools.validate import validate
--- a/orpg/orpgCore.py Mon Mar 22 18:38:22 2010 -0600 +++ b/orpg/orpgCore.py Mon Mar 22 19:33:06 2010 -0600 @@ -71,10 +71,14 @@ return it def get(self, key): + if key == 'xml' and key not in self.__components: + import orpg.orpg_xml + self.add('xml', orpg.orpg_xml) + if key in self.__components: if key in self.__depreciated: msg = "accessing %s this was will be depreciated soon" % (key) - warnings.warn(msg, DeprecationWarning, 2) + warnings.warn(msg, DeprecationWarning, 3) return self.__components[key] else: return None
--- a/orpg/orpg_windows.py Mon Mar 22 18:38:22 2010 -0600 +++ b/orpg/orpg_windows.py Mon Mar 22 19:33:06 2010 -0600 @@ -26,11 +26,9 @@ # Description: orpg custom windows # - from orpg.orpg_wx import * from orpg.orpgCore import * import orpg.tools.rgbhex -import orpg.orpg_xml from orpg.tools.metamenus import MenuEx from orpg.dirpath import dir_struct @@ -39,6 +37,9 @@ from orpg.tools.validate import validate from orpg.tools.decorators import debugging +from orpg.external.etree.ElementTree import ElementTree, Element +from orpg.external.etree.ElementTree import fromstring, tostring + class img_helper(object): @debugging def __init__(self): @@ -681,28 +682,6 @@ ##################### @debugging -def do_progress_dlg(parent,title,text,range): - " Returns a new progress dialog" - if wx.Platform == '__WXMSW__': - dlg = orpgProgressDlg(parent,title,text,range) - dlg.Centre() - dlg.Show(1) - dlg.Raise() - else: - dlg = wx.ProgressDialog(title,text,range,parent) - return dlg - -@debugging -def parseXml_with_dlg(parent,s,ownerDocument=None): - "Parse xml with progress dialog" - dlg = do_progress_dlg(parent,"XML Parser","Reading Configuration Files...",2) - #dlg.Update(1) - doc = orpg.orpg_xml.parseXml(s) - dlg.Update(1,"Done.") - dlg.Destroy() - return doc - -@debugging def createMaskedButton(parent, image, tooltip, id, mask_color=wx.WHITE, image_type=wx.BITMAP_TYPE_GIF): gif = wx.Image(image, image_type,).ConvertToBitmap()
--- a/orpg/pluginhandler.py Mon Mar 22 18:38:22 2010 -0600 +++ b/orpg/pluginhandler.py Mon Mar 22 19:33:06 2010 -0600 @@ -5,6 +5,8 @@ from orpg.tools.orpg_log import logger from orpg.tools.validate import validate from orpg.tools.decorators import debugging +from orpg.external.etree.ElementTree import ElementTree, Element +from orpg.external.etree.ElementTree import fromstring, tostring class PluginHandler(object): @debugging @@ -14,7 +16,6 @@ self.settings = settings self.gametree = open_rpg.get_component("tree") self.startplugs = open_rpg.get_component("startplugs") - self.xml = open_rpg.get_component("xml") self.validate = validate self.topframe = open_rpg.get_component("frame") self.plugindb = plugindb @@ -94,22 +95,24 @@ @debugging def plugin_send_msg(self, to, plugin_msg): - xml_dom = self.xml.parseXml(plugin_msg) - xml_dom = xml_dom._get_documentElement() - xml_dom.setAttribute('from', str(self.session.id)) - xml_dom.setAttribute('to', str(to)) - xml_dom.setAttribute('group_id', str(self.session.group_id)) - tag_name = xml_dom._get_tagName() - if not tag_name in self.session.core_msg_handlers: - xml_msg = '<plugin to="' + str(to) - xml_msg += '" from="' + str(self.session.id) - xml_msg += '" group_id="' + str(self.session.group_id) - xml_msg += '" />' + xml_dom.toxml() - self.session.outbox.put(xml_msg) + if isinstance(plugin_msg, basestring): + plugin_msg = fromstring(plugin_msg) + + plugin_msg.set('from', str(self.session.id)) + plugin_msg.set('to', str(to)) + plugin_msg.set('group_id', str(self.session.group_id)) + + if not plugin_msg.tag in self.session.core_msg_handlers: + msg = Element('plugin') + msg.set('to', str(to)) + msg.set('from', str(self.session.id)) + msg.set('group_id', str(self.session.group_id)) + msg.append(plugin_msg) + + self.session.outbox.put(msg) else: #Spoofing attempt pass - xml_dom.unlink() @debugging def message(self, text):
--- a/orpg/tests/conftest.py Mon Mar 22 18:38:22 2010 -0600 +++ b/orpg/tests/conftest.py Mon Mar 22 19:33:06 2010 -0600 @@ -51,7 +51,6 @@ def setup(): from orpg.main import orpgApp, orpgFrame - import orpg.orpg_xml from orpg.orpg_version import CLIENT_STRING open_rpg = request.getfuncargvalue('open_rpg') @@ -60,15 +59,13 @@ 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) open_rpg.add_component('tabbedWindows', []) 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()
--- a/orpg/tests/test_dieroller.py Mon Mar 22 18:38:22 2010 -0600 +++ b/orpg/tests/test_dieroller.py Mon Mar 22 19:33:06 2010 -0600 @@ -1,7 +1,8 @@ import py py.test.importorskip("orpg") -py.test.importorskip("orpg.dieroller.utils") + +from orpg.dieroller import roller_manager def pytest_generate_tests(metafunc): # called once per each test function @@ -28,8 +29,8 @@ #'test_old_roll': _tests, } - def test_roll(self, roll, min_roll, max_roll, num_results=1, extra=None): - from orpg.dieroller import roller_manager + def test_roll(self, roll, min_roll, max_roll, + num_results=1, extra=None): r = roller_manager.process_roll(roll) r = r.split('-->')[1].split('=')[1][1:].strip() results = eval(r)
--- a/orpg/tools/scriptkit.py Mon Mar 22 18:38:22 2010 -0600 +++ b/orpg/tools/scriptkit.py Mon Mar 22 19:33:06 2010 -0600 @@ -30,7 +30,6 @@ import time from orpg.orpg_windows import * -from orpg.orpg_xml import * from orpg.orpg_wx import * import orpg.chat.chat_msg from orpg.tools.orpg_log import logger @@ -46,7 +45,6 @@ self.map = open_rpg.get_component( 'map' ) self.settings = open_rpg.get_component( 'settings' ) self.session = open_rpg.get_component('session') - self.xml = open_rpg.get_component('xml') def addMiniatureToMap( self, min_label, min_url, unique=0 ): """Adds a new miniature icon to the map. Miniature <em>will</em> be labeled unless autolabel is