diff --git a/.gitignore b/.gitignore
index 13f7471..66797e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # Packages
 *.egg-info
+.eggs/*
 
 .tox
 .stestr
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index afc2a4a..3418eb3 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -4,14 +4,14 @@ Contributing
 If you would like to contribute to the development of OpenStack,
 you must follow the steps in this page:
 
-   http://docs.openstack.org/infra/manual/developers.html
+   https://docs.opendev.org/opendev/infra-manual/latest/developers.html
 
 If you already have a good understanding of how the system works and your
 OpenStack accounts are set up, you can skip to the development workflow section
 of this documentation to learn how changes to OpenStack should be submitted for
 review via the Gerrit tool:
 
-   http://docs.openstack.org/infra/manual/developers.html#development-workflow
+   https://docs.opendev.org/opendev/infra-manual/latest/developers.html#development-workflow
 
 Pull requests submitted through GitHub will be ignored.
 
@@ -21,14 +21,15 @@ Bugs should be filed on StoryBoard, not GitHub:
 
 To browse the latest code:
 
-   https://git.openstack.org/cgit/openstack-infra/gerritlib/tree/
+   https://opendev.org/opendev/gerritlib
 
 To clone the latest code:
 
-   git clone https://git.openstack.org/openstack-infra/gerritlib
+   git clone https://opendev.org/opendev/gerritlib
 
 Code reviews are handled by gerrit:
-   http://review.openstack.org
+
+   https://review.opendev.org/
 
 Use `git review` to submit patches (after creating a gerrit
 account that links to your launchpad account). Example::
diff --git a/README.rst b/README.rst
index caad97a..7bebb71 100644
--- a/README.rst
+++ b/README.rst
@@ -22,21 +22,21 @@ Bug report:
 
 Repository:
 
-* https://git.openstack.org/cgit/openstack-infra/gerritlib
+* https://opendev.org/opendev/gerritlib
 
 Cloning::
 
-    git clone https://git.openstack.org/openstack-infra/gerritlib
+    git clone https://opendev.org/opendev/gerritlib
 
 Patches are submitted via Gerrit at:
 
-* https://review.openstack.org/
+* https://review.opendev.org/
 
 Please do not submit GitHub pull requests, they will be automatically closed.
 
-More details on how you can contribute is available on our wiki at:
+More details on how you can contribute is available at:
 
-* http://docs.openstack.org/infra/manual/developers.html
+* https://docs.opendev.org/opendev/infra-manual/latest/developers.html
 
 Writing a patch
 ---------------
@@ -55,7 +55,7 @@ Then install the required python packages using pip_::
 
     $ sudo pip install gerritlib
 
-.. _Gerrit: https://code.google.com/p/gerrit/
+.. _Gerrit: https://www.gerritcodereview.com/
 .. _pyflakes: https://pypi.python.org/pypi/pyflakes
 .. _tox: https://testrun.org/tox
 .. _pip: https://pypi.python.org/pypi/pip
diff --git a/gerritlib/gerrit.py b/gerritlib/gerrit.py
index a338891..965b55b 100644
--- a/gerritlib/gerrit.py
+++ b/gerritlib/gerrit.py
@@ -150,8 +150,8 @@ class GerritWatcher(threading.Thread):
                         pprint.pformat(data))
                     self.gerrit.addEvent(data)
             except json.decoder.JSONDecodeError:
-                self.log.debug("Can not parse data from Gerrit event stream: \n%s" %
-                               pprint.pformat(line))
+                self.log.debug("Cannot parse data from Gerrit event stream: "
+                               "\n%s" % pprint.pformat(line))
         else:
             # blank read indicates EOF and the connection closed
             self.state = DISCONNECTED