Mercurial > parpg-source

diff dialogueparsers.py @ 2:06145a6ee387

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed resource path dependencies issue that caused PARPG to crash on start. * PARPG should now run without issue (system installation not tested). * Utilized FIFE's VFS module to remove path dependencies from most PARPG modules. * The new parpg.vfs module is a singleton with a single global variable, VFS, which is a reference to the global VFS instance. Although a singleton is not ideal it should be replaced once PARPG's core code is refactored. * The parpg.vfs singleton is initialized in the parpg.applicaiton.PARPGApplication class with the absolute path to the data directory via the parpg.settings module and corresponding configuration file. * A new DataPath entry was added to the default system configuration file template under the [parpg] section to support the new parpg.vfs module. * Updated the parpg-assets subrepo to revision 3 to fix some dialog file format issues (for details see commit message for parpg-assets). * Fixed a few bugs in the parpg.dialogueparsers.YAMLDialogueParser class related to exception handling.
author M. George Hansen <technopolitica@gmail.com>
date Mon, 06 Jun 2011 15:56:14 -1000
parents 7a89ea5404b1
children
line wrap: on
line diff
--- a/dialogueparsers.py	Tue May 31 02:46:20 2011 -0700
+++ b/dialogueparsers.py	Mon Jun 06 15:56:14 2011 -1000
@@ -114,11 +114,7 @@
         @type loader_class: yaml.BaseLoader subclass
         """
         loader = loader_class(stream)
-        try:
-            dialogue = \
-                self._constructDialogue(loader, loader.get_single_node())
-        except (AssertionError,) as error:
-            raise DialogueFormatError(str(error))
+        dialogue = self._constructDialogue(loader, loader.get_single_node())
         return dialogue
     
     def dump(self, dialogue, output_stream, dumper_class=yaml.Dumper):
@@ -368,8 +364,9 @@
                             section_node
                         )
                         sections.append(dialogue_section)
-        except (AttributeError, TypeError, ValueError) as e:
-            raise DialogueFormatError(e)
+        except (AttributeError, TypeError, ValueError,
+                yaml.scanner.ScannerError) as error:
+            raise DialogueFormatError(error)
         
         dialogue = Dialogue(npc_name=npc_name, avatar_path=avatar_path,
                             default_greeting=default_greeting,