From a94e3d8c60128f515054f9a08305f8f6ec6d1e71 Mon Sep 17 00:00:00 2001
From: Eric Holscher <eric@ericholscher.com>
Date: Wed, 10 Jun 2015 11:01:06 -0700
Subject: [PATCH] Clean up warnings and move jinja_env onto base

---
 autoapi/domains/base.py       | 4 +++-
 autoapi/domains/javascript.py | 4 ++--
 autoapi/domains/python.py     | 9 ++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/autoapi/domains/base.py b/autoapi/domains/base.py
index 6922863..8842b4b 100644
--- a/autoapi/domains/base.py
+++ b/autoapi/domains/base.py
@@ -16,8 +16,10 @@ class AutoAPIBase(object):
     language = 'base'
     type = 'base'
 
-    def __init__(self, obj):
+    def __init__(self, obj, jinja_env=None):
         self.obj = obj
+        if jinja_env:
+            self.jinja_env = jinja_env
 
     def render(self, ctx=None):
         if not ctx:
diff --git a/autoapi/domains/javascript.py b/autoapi/domains/javascript.py
index e56981a..d289201 100644
--- a/autoapi/domains/javascript.py
+++ b/autoapi/domains/javascript.py
@@ -27,9 +27,9 @@ class JavaScriptDomain(AutoAPIDomain):
             parsed_data = json.loads(subprocess.check_output(['jsdoc', '-X', path]))
             return parsed_data
         except IOError:
-            print Warning('Error reading file: {0}'.format(path))
+            self.app.warn('Error reading file: {0}'.format(path))
         except TypeError:
-            print Warning('Error reading file: {0}'.format(path))
+            self.app.warn('Error reading file: {0}'.format(path))
         return None
 
     def map(self):
diff --git a/autoapi/domains/python.py b/autoapi/domains/python.py
index ae7db52..a2bc704 100644
--- a/autoapi/domains/python.py
+++ b/autoapi/domains/python.py
@@ -26,9 +26,9 @@ class PythonDomain(AutoAPIDomain):
             parsed_data = parsed(path)
             return parsed_data
         except IOError:
-            print Warning('Error reading file: {0}'.format(path))
+            self.app.warn('Error reading file: {0}'.format(path))
         except TypeError:
-            print Warning('Error reading file: {0}'.format(path))
+            self.app.warn('Error reading file: {0}'.format(path))
         return None
 
     def create_class(self, data):
@@ -64,10 +64,9 @@ class PythonBase(AutoAPIBase):
 
     language = 'python'
 
-    def __init__(self, obj, jinja_env):
-        super(PythonBase, self).__init__(obj)
+    def __init__(self, obj, **kwargs):
+        super(PythonBase, self).__init__(obj, **kwargs)
 
-        self.jinja_env = jinja_env
         # Always exist
         self.id = obj['fullname']
         self.name = self.obj.get('fullname', self.id)