← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~ieknight1101/openlp/pjlink into lp:openlp

 

Ian Knight has proposed merging lp:~ieknight1101/openlp/pjlink into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~ieknight1101/openlp/pjlink/+merge/281821

Fixed typo 'endcode' to 'encode' on line 348 of the pjlink1 module, which was preventing connection to projectors.
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~ieknight1101/openlp/pjlink into lp:openlp.
=== modified file 'openlp/core/lib/projector/pjlink1.py'
--- openlp/core/lib/projector/pjlink1.py	2015-12-31 22:46:06 +0000
+++ openlp/core/lib/projector/pjlink1.py	2016-01-07 06:08:23 +0000
@@ -345,7 +345,7 @@
             # Authenticated login with salt
             log.debug('(%s) Setting hash with salt="%s"' % (self.ip, data_check[2]))
             log.debug('(%s) pin="%s"' % (self.ip, self.pin))
-            salt = qmd5_hash(salt=data_check[2].endcode('ascii'), data=self.pin.encode('ascii'))
+            salt = qmd5_hash(salt=data_check[2].encode('ascii'), data=self.pin.encode('ascii'))
         else:
             salt = None
         # We're connected at this point, so go ahead and do regular I/O


Follow ups