# HG changeset patch
# User sirebral
# Date 1272426496 18000
# Node ID a088a1b4aa9b09efd081aa12684df01409cf22c5
# Parent  f1a67667d78b70061a06c10b7c191f59b6522fb7
Traipse Alpha 'OpenRPG' {100427-04}

Traipse is a distribution of OpenRPG that is designed to be easy to setup and go. Traipse also makes it easy for
developers to work on code without fear of sacrifice. 'Ornery-Orc' continues the trend of 'Grumpy' and adds fixes to
the code. 'Ornery-Orc's main goal is to offer more advanced features and enhance the productivity of the user.

Update Summary (Patch-2)
New Features:
New Namespace method with two new syntaxes
New Namespace Internal is context sensitive, always!
New Namespace External is 'as narrow as you make it'
New Namespace FutureCheck helps ensure you don't receive an incorrect node
New PluginDB access for URL2Link plugin
New to Forms, they now show their content in Design Mode
New to Update Manager, checks Repo for updates on software start

Fixes:
Fix to Server GUI startup errors
Fix to Server GUI Rooms tab updating
Fix to Chat and Settings if non existant die roller is picked
Fix to Dieroller and .open() used with .vs(). Successes are correctly calculated
Fix to Alias Lib's Export to Tree, Open, Save features
Fix to alias node, now works properly
Fix to Splitter node, minor GUI cleanup
Fix to Backgrounds not loading through remote loader
Fix to Node name errors
Fix to rolling dice in chat Whispers
Fix to Splitters Sizing issues
Fix to URL2Link plugin, modified regex compilation should remove memory leak
Fix to mapy.py, a roll back due to zoomed grid issues
Fix to whiteboard_handler, Circles work by you clicking the center of the circle
Fix to Servers parse_incoming_dom which was outdated and did not respect XML
Fix to a broken link in the server welcome message
Fix to InterParse and logger requiring traceback
Fix to Update Manager Status Bar
Fix to failed image and erroneous pop up

Daily: I was having problems with Chat tabs. All fixed now.
Daily: Chat tabs an a small urgency with the Server, plus I kept working.

diff -r f1a67667d78b -r a088a1b4aa9b orpg/mapper/map.py
--- a/orpg/mapper/map.py	Tue Apr 27 06:56:52 2010 -0500
+++ b/orpg/mapper/map.py	Tue Apr 27 22:48:16 2010 -0500
@@ -156,7 +156,8 @@
             else: pass
         if not ImageHandler.Queue.empty():
             (path, image_type, imageId) = ImageHandler.Queue.get()
-            if path == 'failed': img = wx.Image(dir_struct["icon"] + "failed.png", wx.BITMAP_TYPE_PNG)
+            if path == 'failed' or dir_struct["icon"] + "failed.png": 
+                img = wx.Image(dir_struct["icon"] + "failed.png", wx.BITMAP_TYPE_PNG)
             else: img = wx.ImageFromMime(path[1], path[2])
             try:
                 # Now, apply the image to the proper object
diff -r f1a67667d78b -r a088a1b4aa9b orpg/orpg_version.py
--- a/orpg/orpg_version.py	Tue Apr 27 06:56:52 2010 -0500
+++ b/orpg/orpg_version.py	Tue Apr 27 22:48:16 2010 -0500
@@ -4,7 +4,7 @@
 #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed)
 DISTRO = "Traipse Alpha"
 DIS_VER = "Ornery Orc"
-BUILD = "100427-03"
+BUILD = "100427-04"
 
 # This version is for network capability.
 PROTOCOL_VERSION = "1.2"
diff -r f1a67667d78b -r a088a1b4aa9b orpg/tools/InterParse.py
--- a/orpg/tools/InterParse.py	Tue Apr 27 06:56:52 2010 -0500
+++ b/orpg/tools/InterParse.py	Tue Apr 27 22:48:16 2010 -0500
@@ -58,7 +58,7 @@
             try: s = plugin.pre_parse(s)
             except Exception, e:
                 if str(e) != "'module' object has no attribute 'post_msg'":
-                    logger.general(traceback.format_exc())
+                    #logger.general(traceback.format_exc())
                     logger.general("EXCEPTION: " + str(e))
         if tab.parsed == 0:
             s = self.NameSpaceE(s)
diff -r f1a67667d78b -r a088a1b4aa9b plugins/xxurl2link.py
--- a/plugins/xxurl2link.py	Tue Apr 27 06:56:52 2010 -0500
+++ b/plugins/xxurl2link.py	Tue Apr 27 22:48:16 2010 -0500
@@ -25,8 +25,12 @@
         pass
 
     def plugin_enabled(self):
-        self.url_regex = re.compile("((?:http|ftp|gopher)://(.*?).\com)", re.I)
-        self.mailto_regex = re.compile("(.*?(@).*?(.\com))", re.I)
+        self.url_regex = re.compile( #from Paul Hayman of geekzilla
+                    "((https?|ftp|gopher|telnet|file|notes|ms-help):((//)|(\\\\))+[\w\d:#@%/;$()~_?\+-=\\\.&]*)", re.I)
+        self.mailto_regex = re.compile( #Taken from Django
+                    r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*"  # dot-atom
+                    r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-011\013\014\016-\177])*"' # quoted-string
+                    r')@(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+[A-Z]{2,6}\.?$', re.IGNORECASE)
         self.link = self.plugindb.GetString('xxurl2link', 'url2link', '') or 'False'
         self.toggle.Check(True) if self.link == 'True' else self.toggle.Check(False)
 
@@ -34,6 +38,7 @@
         pass
 
     def pre_parse(self, text):
+        text2 = text
         if self.toggle.IsChecked() == True:
             text = self.mailto_regex.sub(self.regmailsub, text)
             text = self.url_regex.sub(self.regurlsub, text)