head	1.2;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.1
	OPENPKG_E1_MP:1.1
	OPENPKG_E1_MP_2_STABLE:1.1.2.2
	OPENPKG_E1_FP:1.1.2.2
	OPENPKG_2_STABLE_MP:1.1
	OPENPKG_2_STABLE_20061018:1.1.2.2
	OPENPKG_2_STABLE:1.1.0.2;
locks; strict;
comment	@# @;


1.2
date	2008.08.28.17.13.58;	author rse;	state dead;
branches;
next	1.1;
commitid	PD4a4atbF0TXSzgt;

1.1
date	2006.10.02.06.13.02;	author rse;	state Exp;
branches
	1.1.2.1;
next	;
commitid	lm0fNBNjQI5hB4Pr;

1.1.2.1
date	2006.10.02.06.13.02;	author rse;	state dead;
branches;
next	1.1.2.2;
commitid	iZxwRSmmWscPXUQr;

1.1.2.2
date	2006.10.16.14.49.21;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.2
log
@upgrading package: data-isocodes 3.2 -> 3.3
@
text
@Index: iso_3166/iso3166tab.py
--- iso_3166/iso3166tab.py.orig	2006-09-29 21:45:59 +0200
+++ iso_3166/iso3166tab.py	2006-10-02 08:11:28 +0200
@@@@ -15,10 +15,12 @@@@
 		self.ofile = ofile
 
 	def startElement(self, name, attrs):
-		if name != 'iso_3166_entry':
+		if name != 'iso_3166_entry' and name != 'iso_3166_2_entry':
 			return
 		code = attrs.get('alpha_2_code', None)
 		if code == None:
+		    code = attrs.get('code', None)
+		if code == None:
 			raise RunTimeError, "Bad file"	
 		if type(code) == unicode:
 			code = code.encode('UTF-8')
@


1.1
log
@fix generation of .txt files
@
text
@@


1.1.2.1
log
@file data-isocodes.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:49:21 +0000
@
text
@d1 17
@


1.1.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 17
Index: iso_3166/iso3166tab.py
--- iso_3166/iso3166tab.py.orig	2006-09-29 21:45:59 +0200
+++ iso_3166/iso3166tab.py	2006-10-02 08:11:28 +0200
@@@@ -15,10 +15,12 @@@@
 		self.ofile = ofile
 
 	def startElement(self, name, attrs):
-		if name != 'iso_3166_entry':
+		if name != 'iso_3166_entry' and name != 'iso_3166_2_entry':
 			return
 		code = attrs.get('alpha_2_code', None)
 		if code == None:
+		    code = attrs.get('code', None)
+		if code == None:
 			raise RunTimeError, "Bad file"	
 		if type(code) == unicode:
 			code = code.encode('UTF-8')
@