python tests: fix format() strings for Python 2.6

[samba.git] / python / samba / tests / password_hash_gpgme.py

diff --git a/python/samba/tests/password_hash_gpgme.py b/python/samba/tests/password_hash_gpgme.py
index 2834ab557c0ca74dbdae5dbbbb49ff49da717a1b..42cd71d3e0812bed3e5901e59708ef50f5388a88 100644 (file)
--- a/python/samba/tests/password_hash_gpgme.py
+++ b/python/samba/tests/password_hash_gpgme.py
@@ -47,7 +47,7 @@ class PassWordHashGpgmeTests(PassWordHashTests):
         self.add_user()
         if not self.lp.get("password hash gpg key ids"):
             self.skipTest("No password hash gpg key ids, " +
-                          "Primary:SambaGPG will not be generated");
+                          "Primary:SambaGPG will not be generated")
 
         sc = self.get_supplemental_creds()
 
@@ -85,7 +85,7 @@ class PassWordHashGpgmeTests(PassWordHashTests):
         self.add_user(clear_text=True)
         if not self.lp.get("password hash gpg key ids"):
             self.skipTest("No password hash gpg key ids, " +
-                          "Primary:SambaGPG will not be generated");
+                          "Primary:SambaGPG will not be generated")
 
         sc = self.get_supplemental_creds()
 
@@ -133,7 +133,7 @@ class PassWordHashGpgmeTests(PassWordHashTests):
         sc = self.get_supplemental_creds()
         if expect_cleartext:
             (pos, ct_package) = get_package(sc, "Primary:CLEARTEXT")
-            self.assertTrue(ct_package != None, "Failed to retrieve cleartext")
+            self.assertTrue(ct_package is not None, "Failed to retrieve cleartext")
 
             # Check the clear-text value is correct.
             ct = ndr_unpack(drsblobs.package_PrimaryCLEARTEXTBlob,
@@ -141,7 +141,7 @@ class PassWordHashGpgmeTests(PassWordHashTests):
             self.assertEquals(password.encode('utf-16-le'), ct.cleartext)
         else:
             ct_package = get_package(sc, "Primary:CLEARTEXT")
-            self.assertTrue(ct_package == None,
+            self.assertTrue(ct_package is None,
                             "Got cleartext when we shouldn't have")
 
     def test_supplementalCredentials_cleartext_pso(self):