Merge ~cjwatson/launchpad:py3-contrib-glock-bool-constants into launchpad:master

[Colin Watson]

Remove pre-2.2 compatibility from contrib.glock

Assigning to True and False is a SyntaxError in Python 3, even if it's guarded by a conditional that's always false at run-time.

[Ioana Lasc (ilasc)]

review: Approve

diff --git a/lib/contrib/glock.py b/lib/contrib/glock.py
index e1a7364..d1ced09 100644
--- a/lib/contrib/glock.py
+++ b/lib/contrib/glock.py
@@ -73,11 +73,6 @@ class LockAlreadyAcquired(GlobalLockError):
     pass
 
 
-# Constants
-# ---------:
-if sys.version[:3] < '2.2':
-    True, False = 1, 0  # built-in in Python 2.2+
-
 #----------------------------------------------------------------------------
 class GlobalLock:
 #----------------------------------------------------------------------------