[Python-apps-commits] r4489 - in packages/ttb/trunk/debian/patches (01-small_update.diff)

[quadrispro-guest at users.alioth.debian.org]

    Date: Sunday, January 10, 2010 @ 12:37:12
  Author: quadrispro-guest
Revision: 4489

Bugfix #564558

Modified:
  packages/ttb/trunk/debian/patches/01-small_update.diff

Modified: packages/ttb/trunk/debian/patches/01-small_update.diff
===================================================================
--- packages/ttb/trunk/debian/patches/01-small_update.diff	2010-01-10 12:36:08 UTC (rev 4488)
+++ packages/ttb/trunk/debian/patches/01-small_update.diff	2010-01-10 12:37:12 UTC (rev 4489)
@@ -1,9 +1,11 @@
 Description: some bugfixes and small improvements
 Vendor: http://gitorious.org/ttb/mainline/commit/613f50b23df0bcd1720f3d64f584578652d7f26d
-Index: ttb-1.0.1/src/ttb
-===================================================================
---- ttb-1.0.1.orig/src/ttb	2009-10-21 23:35:48.583141606 +0200
-+++ ttb-1.0.1/src/ttb	2009-10-21 23:35:51.359141415 +0200
+---
+ src/ttb |   50 ++++++++++++++++++++++++++++++++++++++------------
+ 1 file changed, 38 insertions(+), 12 deletions(-)
+
+--- ttb-1.0.1.orig/src/ttb
++++ ttb-1.0.1/src/ttb
 @@ -1,6 +1,6 @@
  #!/usr/bin/env python
  # -*-mode:python-*-*
@@ -12,7 +14,7 @@
  #
  # Browser for Teletekst pages
  #
-@@ -55,6 +55,13 @@
+@@ -55,6 +55,13 @@ ttb_icon_data  = 'pixmaps/ttb.png'
  
  ttb_debug = 0
  
@@ -26,7 +28,7 @@
  #
  # our main application class
  #
-@@ -158,13 +165,17 @@
+@@ -158,13 +165,17 @@ class PageManager:
                  self.history.append (page)
          except:      
              if (page[1] != 1):
@@ -39,16 +41,16 @@
 -                return self.page 
 -                               
 +
-+                try: 
++                try:
 +                    self.image_file = self.network.retrieve_error_page()
 +                    return self.page
 +                except:
 +                    error_exit ("Verbinding met Teletekst mislukt!")
-+                    
++
          self.image_file = new_image
          self.metainfo = metainfo
          self.page = page
-@@ -309,7 +320,7 @@
+@@ -309,7 +320,7 @@ class GUI:
          elif how == self.size.BIGGER:
              self.size.grow()
          else:
@@ -57,7 +59,7 @@
              
          self.update()
          self.look_busy(0)
-@@ -775,7 +786,7 @@
+@@ -775,7 +786,7 @@ class Network:
              try:
                  data = self.http_get (gif)
              except:
@@ -66,7 +68,7 @@
                  
              # save the gif to a tempfile
              imgfile = open (localimg,'w')
-@@ -789,7 +800,7 @@
+@@ -789,7 +800,7 @@ class Network:
                  html = self.http_get(html)
                  data = html.replace('<script','<!--').replace('</script>','-->')
              except:
@@ -75,7 +77,7 @@
                 
              htmlfile = open (localhtml,'w')
              htmlfile.write (data)
-@@ -814,7 +825,7 @@
+@@ -814,7 +825,7 @@ class Network:
              try:
                  data = self.http_get (errorgif)
              except:
@@ -84,7 +86,7 @@
      
              # save the gif to a tempfile
              imgfile = open (localerr,'w')
-@@ -835,7 +846,7 @@
+@@ -835,7 +846,7 @@ def get_data_dir ():
          if os.path.isdir (fp):
              return fp
  
@@ -93,7 +95,7 @@
  
  def get_data_file (name):
  
-@@ -844,10 +855,22 @@
+@@ -844,10 +855,22 @@ def get_data_file (name):
      if os.path.isfile(fp):
          return fp
  
@@ -114,16 +116,16 @@
 +    dialog.run()
 +
 +    sys.exit(1)
-+      
++
  
  def main (argv=None):
      
-@@ -879,6 +902,9 @@
+@@ -879,6 +902,9 @@ def main (argv=None):
      
      except KeyboardInterrupt:
          return 0
 +
-+    except TTBException as ex:
++    except TTBException, ex:
 +        error_exit (ex.msg)
      
      return 0