Add direct yaml and json support to resources.

diff --git a/naja/resources/__init__.py b/naja/resources/__init__.py
index 191cbd4170fe20399dcb6acd8bd764b0c9933c94..b080786609851f3953531ef5f47e682e7ef6256e 100644 (file)
--- a/naja/resources/__init__.py
+++ b/naja/resources/__init__.py
@@ -1,3 +1,5 @@
-from naja.resources.loader import Loader
+from naja.resources.loader import Loader, ResourceNotFound
+
+__all__ = ['resources', 'ResourceNotFound']
 
 resources = Loader('data')

diff --git a/naja/resources/loader.py b/naja/resources/loader.py
index 28a3c7a3fdf0f39cb85918d3f97f0dbb964b69e0..69eff2fed3fafa891fb9e8c32dbbfd090d24f360 100644 (file)
--- a/naja/resources/loader.py
+++ b/naja/resources/loader.py
@@ -1,5 +1,6 @@
 import os
 import sys
+import json
 
 try:
     from pkg_resources import resource_filename
@@ -11,6 +12,12 @@ except ImportError:
         # time going down this rabbithole already
         return os.path.join(os.path.dirname(__file__), '..', '..', 'data',
                             path)
+
+try:
+    import yaml
+except ImportError:
+    yaml = None
+
 import pygame
 
 
@@ -99,3 +106,15 @@ class Loader(object):
             self._cache[key] = pygame.font.Font(fn, font_size)
 
         return self._cache[key]
+
+    def get_yaml(self, *path_fragments):
+        if yaml is None:
+            raise ResourceNotFound("%s - %s" % (
+                os.path.join(*path_fragments),
+                "YAML module not available"))
+        with self.get_file(*path_fragments) as yaml_file:
+            return yaml.safe_load(yaml_file)
+
+    def get_json(self, *path_fragments):
+        with self.get_file(*path_fragments) as json_file:
+            return json.load(json_file)