Better handing of python2 and SAX

svn: r120

gramps/gramps.spec

@@ -1,4 +1,4 @@
-%define ver      0.2.0
+%define ver      0.3.0
 %define rel      1
 %define prefix   /usr
 
@@ -13,8 +13,9 @@ BuildRoot: /var/tmp/%{name}-%{version}-root
 
 URL: http://gramps.sourceforge.net
 
-Requires: python >= 1.5.2
+Requires: python = 1.5.2
 Requires: pygnome >= 1.0.53
+Requires: pygnome-libglade
 Requires: PyXML
 
 %description
@@ -53,6 +54,8 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/share/pixmaps/gramps.png
 # %{prefix}/share/gramps/*
 %{prefix}/share/locale/*/LC_MESSAGES/gramps.mo
+%{prefix}/share/example/gedcom/*
+%{prefix}/share/example/gramps/*
 %{prefix}/share/gramps/*.pyo
 %{prefix}/share/gramps/*.so
 %{prefix}/share/gramps/*.py
@@ -62,5 +65,6 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/share/gramps/filters/*.py
 %{prefix}/share/gramps/filters/*.pyo
 %{prefix}/share/gramps/plugins/*.py
+%{prefix}/share/gramps/plugins/*.glade
 %{prefix}/share/gramps/plugins/*.pyo
 

gramps/src/GrampsParser.py

@@ -23,6 +23,7 @@ from Researcher import Researcher
 
 import string
 import os
+import sys
 
 from xml.sax import handler
 
@@ -31,10 +32,13 @@ from xml.sax import handler
 # Try to abstract SAX1 from SAX2
 #
 #-------------------------------------------------------------------------
-try:
+if sys.version[0] != '1':
+    sax = 2
+else:
+    try:
         import xml.sax.saxexts
         sax = 1
-except:
+    except:
         sax = 2
 
 from latin_utf8 import utf8_to_latin

gramps/src/ReadXML.py

@@ -30,6 +30,7 @@ import gzip
 import os
 from gnome.ui import *
 
+import sys
 import xml.sax
 import xml.sax.saxutils
 
@@ -38,10 +39,14 @@ import xml.sax.saxutils
 # Try to abstract SAX1 from SAX2
 #
 #-------------------------------------------------------------------------
-try:
+
+if sys.version[0] != '1':
+    sax = 2
+else:
+    try:
         import xml.sax.saxexts
         sax = 1
-except:
+    except:
         sax = 2
 
 #-------------------------------------------------------------------------

gramps/src/TextDoc.py

@@ -20,6 +20,7 @@
 
 import string
 import os
+import sys
 import xml.sax
 import xml.sax.saxutils
 import utils
@@ -29,13 +30,15 @@ import utils
 # Try to abstract SAX1 from SAX2
 #
 #-------------------------------------------------------------------------
-try:
+if sys.version[0] != '1':
+    sax = 2
+else:
+    try:
         import xml.sax.saxexts
         sax = 1
-except:
+    except:
         sax = 2
 
-
 FONT_SANS_SERIF = 0
 FONT_SERIF = 1
 

gramps/src/latin_utf8.py

@@ -18,9 +18,19 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-import cStringIO
+import sys
+
+if sys.version[0] != '1':
+    def utf8_to_latin(s):
+        return s.encode('latin-1')
+
+    def latin_to_utf8(s):
+        return s.encode('utf-8')
+
+else:
+    try:
+        import cStringIO
     
-try:
         from xml.unicode.utf8_iso import code_to_utf8
         from xml.unicode.iso8859 import UTF8String
 
@@ -42,11 +52,10 @@ try:
             buff.close()
             return ans
 
-except:
-    
+    except:
         def utf8_to_latin(s):
-        return s.encode('latin-1')
+            return s
 
         def latin_to_utf8(s):
-        return s.encode('utf-8')
+            return s