update/fix demjson

Author: Sandmann79

addon.xml

@@ -20,12 +20,12 @@
 </addon> 
 <addon id="plugin.video.amazon" 
        name="Amazon" 
-       version="1.4.6" 
+       version="1.4.7" 
        provider-name="Sandmann79 + BlueCop + Romans I XVI"> 
   <requires> 
     <import addon="xbmc.python" version="2.1.0"/> 
     <import addon="script.module.beautifulsoup" version="3.2.1"/> 
-    <import addon="script.module.demjson" version="2.2.2"/> 
+    <import addon="script.module.demjson" version="2.2.3"/> 
     <import addon="script.module.mechanize" version="0.2.6"/> 
     <import addon="script.module.amazon.database" version="0.0.9"/> 
   </requires> 
@@ -76,7 +76,7 @@
 </addon> 
 <addon id="script.module.demjson" 
        name="demjson" 
-       version="2.2.2" 
+       version="2.2.3" 
        provider-name="deron.meranda.us"> 
   <requires> 
     <import addon="xbmc.python" version="2.1.0"/> 

addon.xml.md5

@@ -1 +1 @@
-a2cf9e06a5887b8a2c11397aa914ccf3 
+0a133649f6dd5d58c6ba424a92ec61bd 

plugin.video.amazon/addon.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.video.amazon"
        name="Amazon"
-       version="1.4.6"
+       version="1.4.7"
        provider-name="Sandmann79 + BlueCop + Romans I XVI">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
     <import addon="script.module.beautifulsoup" version="3.2.1"/>
-    <import addon="script.module.demjson" version="2.2.2"/>
+    <import addon="script.module.demjson" version="2.2.3"/>
     <import addon="script.module.mechanize" version="0.2.6"/>
     <import addon="script.module.amazon.database" version="0.0.9"/>
   </requires>

…deo.amazon/plugin.video.amazon-1.4.6.zip …deo.amazon/plugin.video.amazon-1.4.7.zipplugin.video.amazon/plugin.video.amazon-1.4.6.zip renamed to plugin.video.amazon/plugin.video.amazon-1.4.7.zip plugin.video.amazon/plugin.video.amazon-1.4.6.zip renamed to plugin.video.amazon/plugin.video.amazon-1.4.7.zip

@@ -16,11 +16,12 @@
 import xbmc
 import urlparse
 import base64
-import demjson
 import binascii
 import hmac
 import time
 import hashlib
+try: from demjson import demjson
+except: import demjson
 
 addon = xbmcaddon.Addon()
 __plugin__ = addon.getAddonInfo('name')

plugin.video.amazon/resources/lib/common.py

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="script.module.demjson"
        name="demjson"
-       version="2.2.2"
+       version="2.2.3"
        provider-name="deron.meranda.us">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>

script.module.demjson/addon.xml

@@ -120,9 +120,9 @@
 __author__ = "Deron Meranda <http://deron.meranda.us/>"
 __homepage__ = "http://deron.meranda.us/python/demjson/"
 
-__date__ = "2014-06-25"
-__version__ = "2.2.2"
-__version_info__ = ( 2, 2, 2 )    # Will be converted into a namedtuple below
+__date__ = "2014-11-12"
+__version__ = "2.2.3"
+__version_info__ = ( 2, 2, 3 )    # Will be converted into a namedtuple below
 
 __credits__ = """Copyright (c) 2006-2014 Deron E. Meranda <http://deron.meranda.us/>
 
@@ -6000,7 +6000,7 @@ def _lintcheck( self, filename, output_filename,
                 fp.close()
             except IOError, err:
                 self.stderr.write('%s: %s\n' % (pfx, str(err)) )
-                return False
+                return self.SUCCESS_FAIL
             if verbose:
                 verbose_fp = self.stdout
 
@@ -6255,13 +6255,17 @@ def main( self, argv ):
 
         for fn in args:
             try:
-                if not self._lintcheck( fn, output_filename=output_filename,
-                                        verbose=verbose,
-                                        reformat=reformat,
-                                        show_stats=show_stats,
-                                        input_encoding=input_encoding,
-                                        output_encoding=output_encoding,
-                                        jsonopts=jsonopts ):
+                rc = self._lintcheck( fn, output_filename=output_filename,
+                                      verbose=verbose,
+                                      reformat=reformat,
+                                      show_stats=show_stats,
+                                      input_encoding=input_encoding,
+                                      output_encoding=output_encoding,
+                                      jsonopts=jsonopts )
+                if rc != self.SUCCESS_OK:
+                    # Warnings or errors should result in failure.  If
+                    # checking multiple files, do not change a
+                    # previous error back to ok.
                     success = False
             except KeyboardInterrupt, err:
                 sys.stderr.write("\njsonlint interrupted!\n")