X-Git-Url: http://git.code-monkey.de/?p=plugin.video.netflix.git;a=blobdiff_plain;f=resources%2Flib%2FNetflixSession.py;fp=resources%2Flib%2FNetflixSession.py;h=69c848f666f1761e14cc6c501321cd1faae39182;hp=ca4bd5cc0272449d88bfaaf71a96ce508b17acb4;hb=c6e56c0365952da48fa6678c83497fecdb5d73e6;hpb=0d4ecc1df264b7b5a8d0361c84e0d09d80e3b567 diff --git a/resources/lib/NetflixSession.py b/resources/lib/NetflixSession.py index ca4bd5c..69c848f 100644 --- a/resources/lib/NetflixSession.py +++ b/resources/lib/NetflixSession.py @@ -2301,20 +2301,22 @@ class NetflixSession: """ # we generate an esn from device strings for android import subprocess - manufacturer = subprocess.check_output(["/system/bin/getprop", "ro.product.manufacturer"]) - - if manufacturer : - esn = 'NFANDROID1-PRV-' - input = subprocess.check_output(["/system/bin/getprop", "ro.nrdp.modelgroup"]) - if not input: - esn = esn + 'T-L3-' - else: - esn = esn + input.strip(' \t\n\r') + '-' - esn = esn + '{:5}'.format(manufacturer.strip(' \t\n\r').upper()) - input = subprocess.check_output(["/system/bin/getprop" ,"ro.product.model"]) - esn = esn + input.strip(' \t\n\r').replace(' ', '=').upper() - self.log(msg='Android generated ESN:' + esn) - return esn + try: + manufacturer = subprocess.check_output(["/system/bin/getprop", "ro.product.manufacturer"]) + if manufacturer: + esn = 'NFANDROID1-PRV-' + input = subprocess.check_output(["/system/bin/getprop", "ro.nrdp.modelgroup"]) + if not input: + esn = esn + 'T-L3-' + else: + esn = esn + input.strip(' \t\n\r') + '-' + esn = esn + '{:5}'.format(manufacturer.strip(' \t\n\r').upper()) + input = subprocess.check_output(["/system/bin/getprop" ,"ro.product.model"]) + esn = esn + input.strip(' \t\n\r').replace(' ', '=').upper() + self.log(msg='Android generated ESN:' + esn) + return esn + except OSError as e: + self.log(msg='Ignoring exception for non Android devices') # values are accessible via dict (sloppy parsing successfull) if type(netflix_page_data) == dict: