check_rabbitmq.py syntax error

[Xav Paice]

I upgraded from cs:rabbitmq-server-79 to cs:rabbitmq-server-82, on Trusty (Openstack Mitaka).

The NRPE checks are now failing with "NRPE unable to read output", running locally produces this:

ubuntu@juju-95b47b-0-lxd-11:/etc/nagios/nrpe.d$ /usr/local/lib/nagios/plugins/check_rabbitmq.py --user nagios-rabbitmq-server-0 --password YXcqwsHRpn6jhWY6hbx6HVsrhqWKB8BtGJW8dnb9qZ6rSC8YPWPdbjSckx459kXt --vhost nagios-rabbitmq-server-0
  File "/usr/local/lib/nagios/plugins/check_rabbitmq.py", line 53
    except (socket.error, TypeError), e:
                                    ^
SyntaxError: invalid syntax
ubuntu@juju-95b47b-0-lxd-11:/etc/nagios/nrpe.d$ echo $?
1

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/618971

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/618971
Committed: https://git.openstack.org/cgit/openstack/charm-rabbitmq-server/commit/?id=f30b4ac0c696f5bb344db592919c75bb71e96b34
Submitter: Zuul
Branch: master

commit f30b4ac0c696f5bb344db592919c75bb71e96b34
Author: Alex Kavanagh <email address hidden>
Date: Tue Nov 20 08:38:51 2018 +0000

    Fix incorrect syntax in scripts/check_rabbitmq.py

    * This fixes the incorrect syntax in the scripts/check_rabbitmq.py
      file. Unfortunately, there are no tests for these files. To
      help with QA, added the 'scripts' directory to the pep8 test to
      validate that they are correct python syntax for future changes.

    * Updated .gitigore to exclude __pycache__ directories for py3 and
      removed the __pycache__ directory files from the repo.

    Change-Id: I406a70c3d04eb730e1c59189a83cc57495186105
    Closes-Bug: #1804126

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/18.11
Review: https://review.openstack.org/618998

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/618998
Committed: https://git.openstack.org/cgit/openstack/charm-rabbitmq-server/commit/?id=dea18af63a0119b529c7023f06e5d7395a366ccb
Submitter: Zuul
Branch: stable/18.11

commit dea18af63a0119b529c7023f06e5d7395a366ccb
Author: Alex Kavanagh <email address hidden>
Date: Tue Nov 20 08:38:51 2018 +0000

    Fix incorrect syntax in scripts/check_rabbitmq.py

    * This fixes the incorrect syntax in the scripts/check_rabbitmq.py
      file. Unfortunately, there are no tests for these files. To
      help with QA, added the 'scripts' directory to the pep8 test to
      validate that they are correct python syntax for future changes.

    * Updated .gitigore to exclude __pycache__ directories for py3 and
      removed the __pycache__ directory files from the repo.

    Related-Bug: #1804126
    (cherry picked from commit f30b4ac0c696f5bb344db592919c75bb71e96b34)

    Change-Id: Idbe071df8d66cd0a4a977f9add7392215cfa2bf0