Don't force-to-latin, just use (and assume) utf8

[dak.git] / dak / queue_report.py
diff --git a/dak/queue_report.py b/dak/queue_report.py

index a8ae08d4f373ef4a9cbec07df115c23a02f4b479..a4cee3591fc57abc1e1de905563fa860d2ba6471 100755 (executable)
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -36,8 +36,8 @@
  
  import copy, glob, os, stat, sys, time
  import apt_pkg
-import dak.lib.queue as queue
-import dak.lib.utils as utils
+import daklib.queue 
+import daklib.utils
  
  Cnf = None
  Upload = None
@@ -157,7 +157,7 @@ def sortfunc(a,b):
  
  def header():
      print """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-       <html><head><meta http-equiv="Content-Type" content="text/html; charset=iso8859-1">
+       <html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8">
         <title>Debian NEW and BYHAND Packages</title>
         <link type="text/css" rel="stylesheet" href="style.css">
         <link rel="shortcut icon" href="http://www.debian.org/favicon.ico">
@@ -222,11 +222,6 @@ def table_footer(type, source_count, total_count):
      print "<p class=\"validate\">Package count in <b>%s</b>: <i>%s</i>\n" % (type, source_count)
      print "<br>Total Package count: <i>%s</i></p>\n" % (total_count)
  
-def force_to_latin(s):
-    """Forces a string to Latin-1."""
-    latin1_s = unicode(s,'utf-8')
-    return latin1_s.encode('iso8859-1', 'replace')
-
  
  def table_row(source, version, arch, last_mod, maint, distribution, closes):
  
@@ -250,7 +245,6 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes):
          print "%s<br>" % (dist)
      print "</td><td valign=\"top\" class=\"%s\">%s</td>" % (tdclass, last_mod)
      (name, mail) = maint.split(":")
-    name = force_to_latin(name)
  
      print "<td valign=\"top\" class=\"%s\"><a href=\"http://qa.debian.org/developer.php?login=%s\">%s</a></td>" % (tdclass, mail, name)
      print "<td valign=\"top\" class=\"%s\">" % (tdclass)
@@ -328,8 +322,8 @@ def process_changes_files(changes_files, type):
                  try:
                      (maintainer["maintainer822"], maintainer["maintainer2047"],
                      maintainer["maintainername"], maintainer["maintaineremail"]) = \
-                    utils.fix_maintainer (j["maintainer"])
-                except utils.ParseMaintError, msg:
+                    daklib.utils.fix_maintainer (j["maintainer"])
+                except daklib.utils.ParseMaintError, msg:
                      print "Problems while parsing maintainer address\n"
                      maintainer["maintainername"] = "Unknown"
                      maintainer["maintaineremail"] = "Unknown"
@@ -341,7 +335,7 @@ def process_changes_files(changes_files, type):
              version = j["version"]
              versions[version] = ""
          arches_list = arches.keys()
-        arches_list.sort(utils.arch_compare_sw)
+        arches_list.sort(daklib.utils.arch_compare_sw)
          arch_list = " ".join(arches_list)
          version_list = " ".join(versions.keys())
          if len(version_list) > max_version_len:
@@ -429,7 +423,7 @@ def process_changes_files(changes_files, type):
  def main():
      global Cnf, Upload
  
-    Cnf = utils.get_conf()
+    Cnf = daklib.utils.get_conf()
      Arguments = [('h',"help","Queue-Report::Options::Help"),
                   ('n',"new","Queue-Report::Options::New"),
                   ('s',"sort","Queue-Report::Options::Sort", "HasArg"),
@@ -444,7 +438,7 @@ def main():
      if Options["Help"]:
         usage()
  
-    Upload = queue.Upload(Cnf)
+    Upload = daklib.queue.Upload(Cnf)
  
      if Cnf.has_key("Queue-Report::Options::New"):
          header()