Your message dated Fri, 28 Oct 2005 13:48:14 -0700
with message-id <[EMAIL PROTECTED]>
and subject line Bug#331357: fixed in iso-codes 0.49-1
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--------------------------------------
Received: (at submit) by bugs.debian.org; 3 Oct 2005 03:39:33 +0000
>From [EMAIL PROTECTED] Sun Oct 02 20:39:33 2005
Return-path: <[EMAIL PROTECTED]>
Received: from ihug-mail.icp-qv1-irony3.iinet.net.au 
(mail-ihug.icp-qv1-irony3.iinet.net.au) [203.59.1.197] 
        by spohr.debian.org with esmtp (Exim 3.36 1 (Debian))
        id 1EMHAr-00012B-00; Sun, 02 Oct 2005 20:39:33 -0700
Received: from 203-59-207-160.dyn.iinet.net.au (HELO [10.0.42.240]) 
([203.59.207.160])
  by mail-ihug.icp-qv1-irony3.iinet.net.au with ESMTP; 03 Oct 2005 11:39:08 
+0800
Message-ID: <[EMAIL PROTECTED]>
Date: Mon, 03 Oct 2005 11:39:11 +0800
From: James Henstridge <[EMAIL PROTECTED]>
User-Agent: Mozilla Thunderbird 1.0.6 (X11/20050912)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: [EMAIL PROTECTED]
Subject: Allow iso-codes to build without pyxml
X-Enigmail-Version: 0.92.0.0
Content-Type: multipart/mixed;
 boundary="------------080907030706090806040502"
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02 
        (1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Level: 
X-Spam-Status: No, hits=-8.0 required=4.0 tests=BAYES_00,HAS_PACKAGE 
        autolearn=no version=2.60-bugs.debian.org_2005_01_02

This is a multi-part message in MIME format.
--------------080907030706090806040502
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

Package: iso-codes
Version: 0.47

Attached is a patch that makes the Python scripts used to build
iso-codes work with both PyXML and Python's included XML modules.  This
makes it possible to build the package on systems without PyXML installed.

I also made some other minor changes:

    * use "#!/usr/bin/env python" as the first line of scripts so that
      they run when Python is in a non-standard location.
    * return a non-zero error code if the XML file can not be parsed, so
      the build will fail properly in that case.

The patch is against the latest CVS version of the package.

James.

--------------080907030706090806040502
Content-Type: text/x-patch;
 name="iso-codes-no-pyxml.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="iso-codes-no-pyxml.patch"

Index: iso2pot.py
===================================================================
RCS file: /cvsroot/pkg-isocodes/iso-codes/iso2pot.py,v
retrieving revision 1.3
diff -u -p -r1.3 iso2pot.py
--- iso2pot.py  15 Jun 2004 20:36:43 -0000      1.3
+++ iso2pot.py  3 Oct 2005 03:25:48 -0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Read iso-codes data file and output a .pot file
 # 
@@ -6,11 +6,11 @@
 # Released under the GPL.
 # $Id: iso2pot.py,v 1.3 2004/06/15 20:36:43 mckinstry Exp $
 
-from xml.sax import saxutils, make_parser, saxlib, saxexts, ContentHandler
-from xml.sax.handler import feature_namespaces
 import sys, os, getopt, urllib2, locale, time
+from xml.sax import make_parser, SAXException, SAXParseException
+from xml.sax.handler import feature_namespaces, ContentHandler
 
-class printPot(saxutils.DefaultHandler):
+class printPot(ContentHandler):
     def __init__(self, nameslist,comment, ofile):
          """ 
         nameslist is the elements to be printed in msgid strings,
@@ -100,17 +100,20 @@ else:
 printHeader(ofile, report_bugs_to, version)
 
 p = make_parser()
-p.setErrorHandler(saxutils.ErrorPrinter())
 
 try:
     dh = printPot(fields, comment, ofile)
     p.setContentHandler(dh)
     p.parse(trail[0])
-except IOError,e:
-    print in_sysID+": "+str(e)
-except saxlib.SAXException,e:
-    print str(e)
-
+except SAXParseException, e:
+    sys.stderr.write('%s:%s:%s: %s\n' % (e.getSystemId(),
+                                         e.getLineNumber(),
+                                         e.getColumnNumber(),
+                                         e.getMessage()))
+    sys.exit(1)
+except Exception, e:
+    sys.stderr.write('<unknown>: %s\n' % str(e))
+    sys.exit(1)
 
 ofile.close()
 
Index: iso2tab.py
===================================================================
RCS file: /cvsroot/pkg-isocodes/iso-codes/iso2tab.py,v
retrieving revision 1.1
diff -u -p -r1.1 iso2tab.py
--- iso2tab.py  16 May 2004 20:20:42 -0000      1.1
+++ iso2tab.py  3 Oct 2005 03:25:48 -0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Read iso-codes data file and output a .tab file
 # 
@@ -6,11 +6,11 @@
 # Released under the GPL.
 # $Id: iso2tab.py,v 1.1 2004/05/16 20:20:42 mckinstry Exp $
 
-from xml.sax import saxutils, make_parser, saxlib, saxexts, ContentHandler
-from xml.sax.handler import feature_namespaces
 import sys, os, getopt, urllib2
+from xml.sax import make_parser, SAXException, SAXParseException
+from xml.sax.handler import feature_namespaces, ContentHandler
 
-class printLines(saxutils.DefaultHandler):
+class printLines(ContentHandler):
     def __init__(self,element, nameslist, ofile):
          """ 
         nameslist is the elements to be printed in  strings,
@@ -65,16 +65,20 @@ else:
     ofile = sys.stdout
 
 p = make_parser()
-p.setErrorHandler(saxutils.ErrorPrinter())
 
 try:
     dh = printLines(element, fields, ofile)
     p.setContentHandler(dh)
     p.parse(trail[0])
-except IOError,e:
-    print in_sysID+": "+str(e)
-except saxlib.SAXException,e:
-    print str(e)
+except SAXParseException, e:
+    sys.stderr.write('%s:%s:%s: %s\n' % (e.getSystemId(),
+                                         e.getLineNumber(),
+                                         e.getColumnNumber(),
+                                         e.getMessage()))
+    sys.exit(1)
+except Exception, e:
+    sys.stderr.write('<unknown>: %s\n' % str(e))
+    sys.exit(1)
 
 
 ofile.close()
Index: iso_3166/iso3166tab.py
===================================================================
RCS file: /cvsroot/pkg-isocodes/iso-codes/iso_3166/iso3166tab.py,v
retrieving revision 1.2
diff -u -p -r1.2 iso3166tab.py
--- iso_3166/iso3166tab.py      8 Jan 2005 18:06:46 -0000       1.2
+++ iso_3166/iso3166tab.py      3 Oct 2005 03:25:48 -0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Read iso-codes data file and output a .tab file
 # 
@@ -6,11 +6,11 @@
 # Released under the GPL.
 # $Id: iso3166tab.py,v 1.2 2005/01/08 18:06:46 mckinstry Exp $
 
-from xml.sax import saxutils, make_parser, saxlib, saxexts, ContentHandler
-from xml.sax.handler import feature_namespaces
 import sys, os, getopt, urllib2
+from xml.sax import make_parser, SAXException, SAXParseException
+from xml.sax.handler import feature_namespaces, ContentHandler
 
-class printLines(saxutils.DefaultHandler):
+class printLines(ContentHandler):
        def __init__(self, ofile):
                self.ofile = ofile
 
@@ -43,14 +43,18 @@ class printLines(saxutils.DefaultHandler
 
 ofile = sys.stdout
 p = make_parser()
-p.setErrorHandler(saxutils.ErrorPrinter())
 try:
        dh = printLines(ofile)
        p.setContentHandler(dh)
        p.parse(sys.argv[1])
-except IOError,e:
-       print in_sysID+": "+str(e)
-except saxlib.SAXException,e:
-       print str(e)
+except SAXParseException, e:
+       sys.stderr.write('%s:%s:%s: %s\n' % (e.getSystemId(),
+                                            e.getLineNumber(),
+                                            e.getColumnNumber(),
+                                            e.getMessage()))
+       sys.exit(1)
+except Exception, e:
+       sys.stderr.write('<unknown>: %s\n' % str(e))
+       sys.exit(1)
 
 ofile.close()
Index: iso_639/iso639tab.py
===================================================================
RCS file: /cvsroot/pkg-isocodes/iso-codes/iso_639/iso639tab.py,v
retrieving revision 1.1
diff -u -p -r1.1 iso639tab.py
--- iso_639/iso639tab.py        2 Mar 2005 07:24:51 -0000       1.1
+++ iso_639/iso639tab.py        3 Oct 2005 03:25:48 -0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Read iso-codes iso_639.xml data file and output a .tab file
 # 
@@ -6,11 +6,11 @@
 # Released under the GPL.
 # $Id: iso639tab.py,v 1.1 2005/03/02 07:24:51 mckinstry Exp $
 
-from xml.sax import saxutils, make_parser, saxlib, saxexts, ContentHandler
-from xml.sax.handler import feature_namespaces
 import sys, os, getopt, urllib2
+from xml.sax import make_parser, SAXException, SAXParseException
+from xml.sax.handler import feature_namespaces, ContentHandler
 
-class printLines(saxutils.DefaultHandler):
+class printLines(ContentHandler):
        def __init__(self, ofile):
                self.ofile = ofile
 
@@ -68,14 +68,18 @@ ofile.write("""
 ##
 """)
 p = make_parser()
-p.setErrorHandler(saxutils.ErrorPrinter())
 try:
        dh = printLines(ofile)
        p.setContentHandler(dh)
        p.parse(sys.argv[1])
-except IOError,e:
-       print in_sysID+": "+str(e)
-except saxlib.SAXException,e:
-       print str(e)
+except SAXParseException, e:
+       sys.stderr.write('%s:%s:%s: %s\n' % (e.getSystemId(),
+                                            e.getLineNumber(),
+                                            e.getColumnNumber(),
+                                            e.getMessage()))
+       sys.exit(1)
+except Exception, e:
+       sys.stderr.write('<unknown>: %s\n' % str(e))
+       sys.exit(1)
 
 ofile.close()

--------------080907030706090806040502--

---------------------------------------
Received: (at 331357-close) by bugs.debian.org; 28 Oct 2005 20:53:47 +0000
>From [EMAIL PROTECTED] Fri Oct 28 13:53:47 2005
Return-path: <[EMAIL PROTECTED]>
Received: from katie by spohr.debian.org with local (Exim 3.36 1 (Debian))
        id 1EVb94-0003ju-00; Fri, 28 Oct 2005 13:48:14 -0700
From: Alastair McKinstry <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
X-Katie: $Revision: 1.56 $
Subject: Bug#331357: fixed in iso-codes 0.49-1
Message-Id: <[EMAIL PROTECTED]>
Sender: Archive Administrator <[EMAIL PROTECTED]>
Date: Fri, 28 Oct 2005 13:48:14 -0700
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02 
        (1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Level: 
X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER 
        autolearn=no version=2.60-bugs.debian.org_2005_01_02

Source: iso-codes
Source-Version: 0.49-1

We believe that the bug you reported is fixed in the latest version of
iso-codes, which is due to be installed in the Debian FTP archive:

iso-3166-udeb_0.49-1_all.udeb
  to pool/main/i/iso-codes/iso-3166-udeb_0.49-1_all.udeb
iso-codes_0.49-1.diff.gz
  to pool/main/i/iso-codes/iso-codes_0.49-1.diff.gz
iso-codes_0.49-1.dsc
  to pool/main/i/iso-codes/iso-codes_0.49-1.dsc
iso-codes_0.49-1_all.deb
  to pool/main/i/iso-codes/iso-codes_0.49-1_all.deb
iso-codes_0.49.orig.tar.gz
  to pool/main/i/iso-codes/iso-codes_0.49.orig.tar.gz



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Alastair McKinstry <[EMAIL PROTECTED]> (supplier of updated iso-codes package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Fri, 28 Oct 2005 20:01:16 +0100
Source: iso-codes
Binary: iso-3166-udeb iso-codes
Architecture: source all
Version: 0.49-1
Distribution: unstable
Urgency: low
Maintainer: Alastair McKinstry <[EMAIL PROTECTED]>
Changed-By: Alastair McKinstry <[EMAIL PROTECTED]>
Description: 
 iso-3166-udeb - provides iso_3166.tab file (udeb)
 iso-codes  - ISO language, territory, currency  codes and their translations
Closes: 325276 328152 329548 331071 331357 333076 333080 333093 333094 334744 
335234 335975
Changes: 
 iso-codes (0.49-1) unstable; urgency=low
 .
   [ Alastair McKinstry ]
   * iso_639:
     - vi.po updated by  Clytie Siddall.
     - sr.po updated by  Danilo Segan.
     - eo.po updated by Edmund GRIMLEY EVANS.
     - sl.po updated by  Primo Peterlin.
     - ja.po updated by  IIDA Yosiaki.
   * iso_3166:
     - sl.po updated by  Primož Peterlin
     - ku.po by Erdal Ronahî. Closes: #335234.
       Remove byte-order-mark bytes from file ku.po: Closes: #335975.
   * iso_3166_2:
     - corrected spelling errors; thanks to Theppitak Karoonboonyanan.
       Closes: #331071.
   * iso_639.tab: Don't sort headers. Closes: #329548.
   * Allow iso-codes to build without pyxml. Patch thanks to
     James Henstridge. Closes: #331357, #328152.
   * Include draft iso_639_3.xml table so that translators see the translations
     needed. This generates a new.larger iso_639.pot. Closes: #325276.
   * Correct README file, mentioning XML rather than tab formats.
     Closes: #334744.
 .
   [ Tobias Toedter ]
   * iso_4217:
     - th.po translated by Theppitak Karoonboonyanan. Closes: #333076
   * iso_3166:
     - th.po updated by Theppitak Karoonboonyanan. Closes: #333080
   * iso_3166_2:
     - th.po updated by Theppitak Karoonboonyanan. Closes: #333093
   * iso_639:
     - th.po updated by Theppitak Karoonboonyanan. Closes: #333094
Files: 
 eb5629dea159f8ee6ea61633512b8c21 638 misc optional iso-codes_0.49-1.dsc
 62b7f9469e00b92558d5d043a4be3910 3698966 misc optional 
iso-codes_0.49.orig.tar.gz
 7df513e1a7bc20a6959e86dd71c14f20 10919 misc optional iso-codes_0.49-1.diff.gz
 262672845b988b6f74d67e163346c412 1256450 misc optional iso-codes_0.49-1_all.deb
 2c94eb97095d2c4d72a76880389dc70a 2824 debian-installer optional 
iso-3166-udeb_0.49-1_all.udeb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)

iD8DBQFDYoqiQTK/kCo4XFcRAmLmAJwKVPo6HPcr7fzA1HK/3y+1ELsY0wCgsTGt
McXKRWTZoMukzLV3Ip2rtG0=
=jPDW
-----END PGP SIGNATURE-----


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to