← Back to team overview

openlp-core team mailing list archive

Re: [Merge] lp:~alisonken1/openlp/pjlink2-f into lp:openlp

 

Review: Needs Fixing

You left some commented code in, see the inline comment. Also please post the jenkins test result for the latest revision.
Otherwise it looks good to me.

Diff comments:

> 
> === modified file 'openlp/core/lib/projector/pjlink1.py'
> --- openlp/core/lib/projector/pjlink1.py	2017-06-17 00:25:06 +0000
> +++ openlp/core/lib/projector/pjlink1.py	2017-07-07 23:49:26 +0000
> @@ -331,7 +378,8 @@
>                  self.change_status(E_SOCKET_TIMEOUT)
>                  return
>              read = self.readLine(self.max_size)
> -            dontcare = self.readLine(self.max_size)  # Clean out the trailing \r\n
> +            # _ = self.readLine(self.max_size)  # Clean out the trailing \r\n

This should be removed.

> +            self.readLine(self.max_size)  # Clean out the trailing \r\n
>              if read is None:
>                  log.warning('({ip}) read is None - socket error?'.format(ip=self.ip))
>                  return
> @@ -341,7 +389,8 @@
>              data = decode(read, 'utf-8')
>              # Possibility of extraneous data on input when reading.
>              # Clean out extraneous characters in buffer.
> -            dontcare = self.readLine(self.max_size)
> +            # _ = self.readLine(self.max_size)

Also this one.

> +            self.readLine(self.max_size)
>              log.debug('({ip}) check_login() read "{data}"'.format(ip=self.ip, data=data.strip()))
>          # At this point, we should only have the initial login prompt with
>          # possible authentication


-- 
https://code.launchpad.net/~alisonken1/openlp/pjlink2-f/+merge/327052
Your team OpenLP Core is subscribed to branch lp:openlp.


Follow ups

References