Merge branch 'master' of github.com:pykler/yajl-py

Author: pykler

README.rst

@@ -20,6 +20,7 @@ To run the tests you also require:
 
     - make (to run `make test`)
     - nose (debian package == `python-nose`)
+    - MiniMockTest (`pip install minimocktest`)
 
 Install
 -------

tests/test_yajl.py

@@ -1,4 +1,7 @@
-from yajl_test_lib import *
+from yajl_test_lib import yajl
+from minimocktest import MockTestCase
+from StringIO import StringIO
+import sys
 
 class BaseContentHandler(yajl.YajlContentHandler):
     def yajl_null(self, ctx):
@@ -238,7 +241,7 @@ def test_get_yajl_version_correctlyParsesYajlVersion(self):
 
     def test_check_yajl_version_warnsOnlyWhenMismatchedVersions(self):
         import warnings
-        self.mock('warnings.warn', [locals()])
+        self.mock('warnings.warn')
         self.mock('yajl.__version__', mock_obj='1.1.1')
         self.mock('yajl.yajl_version', mock_obj='1.1.1')
         self.assertTrue(yajl.check_yajl_version())

tests/test_yajl_c.py

@@ -1,4 +1,7 @@
-from yajl_test_lib import * 
+from yajl_test_lib import yajl, BASEPATH 
+from minimocktest import MockTestCase
+from StringIO import StringIO
+import os
 import difflib
 
 class YajlCTestContentHandler(yajl.YajlContentHandler):

tests/yajl_test_lib.py

@@ -1,3 +1,6 @@
+'''
+Helper module to import yajl from parent src dir
+'''
 import os
 import sys
 BASEPATH = os.path.dirname(os.path.realpath(__file__))