marge from master

[dak.git] / dak / test / 006 / test.py

diff --git a/dak/test/006/test.py b/dak/test/006/test.py
index d3d90919fdc1eb9c10ab98fa803fe72ad3305071..51a33170aac504711eab42b25d7efe973a53527d 100755 (executable)
--- a/dak/test/006/test.py
+++ b/dak/test/006/test.py
@@ -1,9 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# Test utils.fix_maintainer()
-# Copyright (C) 2004  James Troup <james@nocrew.org>
-# $Id: test.py,v 1.2 2004-06-23 23:11:51 troup Exp $
+# Test textutils.fix_maintainer()
+# Copyright (C) 2004, 2006  James Troup <james@nocrew.org>
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,35 +22,35 @@
 
 import os, sys
 
-sys.path.append(os.path.abspath('../../'));
+sys.path.append(os.path.abspath('../../'))
 
-import utils
+import textutils
 
 ################################################################################
 
 def fail(message):
-    sys.stderr.write("%s\n" % (message));
-    sys.exit(1);
+    sys.stderr.write("%s\n" % (message))
+    sys.exit(1)
 
 ################################################################################
 
 def check_valid(s, xa, xb, xc, xd):
-    (a, b, c, d) = utils.fix_maintainer(s)
+    (a, b, c, d) = textutils.fix_maintainer(s)
     if a != xa:
-        fail("rfc822_maint: %s (returned) != %s (expected [From: '%s']" % (a, xa, s));
+        fail("rfc822_maint: %s (returned) != %s (expected [From: '%s']" % (a, xa, s))
     if b != xb:
-        fail("rfc2047_maint: %s (returned) != %s (expected [From: '%s']" % (b, xb, s));
+        fail("rfc2047_maint: %s (returned) != %s (expected [From: '%s']" % (b, xb, s))
     if c != xc:
-        fail("name: %s (returned) != %s (expected [From: '%s']" % (c, xc, s));
+        fail("name: %s (returned) != %s (expected [From: '%s']" % (c, xc, s))
     if d != xd:
-        fail("email: %s (returned) != %s (expected [From: '%s']" % (d, xd, s));
+        fail("email: %s (returned) != %s (expected [From: '%s']" % (d, xd, s))
 
 def check_invalid(s):
     try:
-        utils.fix_maintainer(s);
-        fail("%s was parsed successfully but is expected to be invalid." % (s));
+        textutils.fix_maintainer(s)
+        fail("%s was parsed successfully but is expected to be invalid." % (s))
     except utils.ParseMaintError, unused:
-        pass;
+        pass
 
 def main ():
     # Check Valid UTF-8 maintainer field
@@ -60,7 +59,7 @@ def main ():
     xb = "=?utf-8?b?Tm/DqGwgS8O2dGhl?= <noel@debian.org>"
     xc = "Noèl Köthe"
     xd = "noel@debian.org"
-    check_valid(s, xa, xb, xc, xd);
+    check_valid(s, xa, xb, xc, xd)
 
     # Check valid ISO-8859-1 maintainer field
     s = "Noèl Köthe <noel@debian.org>"
@@ -68,7 +67,7 @@ def main ():
     xb = "=?iso-8859-1?q?No=E8l_K=F6the?= <noel@debian.org>"
     xc = "Noèl Köthe"
     xd = "noel@debian.org"
-    check_valid(s, xa, xb, xc, xd);
+    check_valid(s, xa, xb, xc, xd)
 
     # Check valid ASCII maintainer field
     s = "James Troup <james@nocrew.org>"
@@ -76,7 +75,7 @@ def main ():
     xb = "James Troup <james@nocrew.org>"
     xc = "James Troup"
     xd = "james@nocrew.org"
-    check_valid(s, xa, xb, xc, xd);
+    check_valid(s, xa, xb, xc, xd)
 
     # Check "Debian vs RFC822" fixup of names with '.' or ',' in them
     s = "James J. Troup <james@nocrew.org>"
@@ -84,13 +83,13 @@ def main ():
     xb = "james@nocrew.org (James J. Troup)"
     xc = "James J. Troup"
     xd = "james@nocrew.org"
-    check_valid(s, xa, xb, xc, xd);
+    check_valid(s, xa, xb, xc, xd)
     s = "James J, Troup <james@nocrew.org>"
     xa = "james@nocrew.org (James J, Troup)"
     xb = "james@nocrew.org (James J, Troup)"
     xc = "James J, Troup"
     xd = "james@nocrew.org"
-    check_valid(s, xa, xb, xc, xd);
+    check_valid(s, xa, xb, xc, xd)
 
     # Check just-email form
     s = "james@nocrew.org"
@@ -98,7 +97,7 @@ def main ():
     xb = " <james@nocrew.org>"
     xc = ""
     xd = "james@nocrew.org"
-    check_valid(s, xa, xb, xc, xd);
+    check_valid(s, xa, xb, xc, xd)
 
     # Check bracketed just-email form
     s = "<james@nocrew.org>"
@@ -106,7 +105,7 @@ def main ():
     xb = " <james@nocrew.org>"
     xc = ""
     xd = "james@nocrew.org"
-    check_valid(s, xa, xb, xc, xd);
+    check_valid(s, xa, xb, xc, xd)
 
     # Check Krazy quoted-string local part email address
     s = "Cris van Pelt <\"Cris van Pelt\"@tribe.eu.org>"
@@ -114,16 +113,16 @@ def main ():
     xb = "Cris van Pelt <\"Cris van Pelt\"@tribe.eu.org>"
     xc = "Cris van Pelt"
     xd = "\"Cris van Pelt\"@tribe.eu.org"
-    check_valid(s, xa, xb, xc, xd);
+    check_valid(s, xa, xb, xc, xd)
 
     # Check empty string
-    s = xa = xb = xc = xd = "";
-    check_valid(s, xa, xb, xc, xd);
+    s = xa = xb = xc = xd = ""
+    check_valid(s, xa, xb, xc, xd)
 
     # Check for missing email address
-    check_invalid("James Troup");
+    check_invalid("James Troup")
     # Check for invalid email address
-    check_invalid("James Troup <james@nocrew.org");
+    check_invalid("James Troup <james@nocrew.org")
 
 ################################################################################