Attachment 311631 Details for Bug 454207 – patch for terminatorterm.py

[patch] patch for terminatorterm.py

terminator-fix_terminatorterm.patch (text/plain), 2.96 KB, created by Mathieu BONIFACE on 2008-07-12 00:19:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu BONIFACE

Created: 2008-07-12 00:19:58 UTC

Size: 2.96 KB

patch

obsolete

>diff -up terminator-0.9/terminatorlib/terminatorterm.py.fix_terminatorterm terminator-0.9/terminatorlib/terminatorterm.py
>--- terminator-0.9/terminatorlib/terminatorterm.py.fix_terminatorterm	2008-07-12 01:30:33.000000000 +0200
>+++ terminator-0.9/terminatorlib/terminatorterm.py	2008-07-12 01:31:53.000000000 +0200
>@@ -52,19 +52,8 @@ class TerminatorTerm (gtk.VBox):
> 
>     # Sort out cwd detection code, if available
>     self.pid_get_cwd = lambda pid: None
>-    if platform.system() == 'FreeBSD':
>-      try:
>-        from terminatorlib import freebsd
>-        self.pid_get_cwd = lambda pid: freebsd.get_process_cwd(pid)
>-        dbg ('Using FreeBSD self.pid_get_cwd')
>-      except:
>-        dbg ('FreeBSD version too old for self.pid_get_cwd')
>-        pass
>-    elif platform.system() == 'Linux':
>-      dbg ('Using Linux self.pid_get_cwd')
>-      self.pid_get_cwd = lambda pid: os.path.realpath ('/proc/%s/cwd' % pid)
>-    else:
>-      dbg ('Unable to set a self.pid_get_cwd, unknown system: %s'%platform.system)
>+    dbg ('Using Linux self.pid_get_cwd')
>+    self.pid_get_cwd = lambda pid: os.path.realpath ('/proc/%s/cwd' % pid)
> 
>     # import a library for viewing URLs
>     try:
>@@ -317,7 +306,7 @@ text/plain
>       pos = "bottom"
>     return pos
> 
>-  def add_matches (self, lboundry="[[:<:]]", rboundry="[[:>:]]"):
>+  def add_matches (self, lboundry="\\<", rboundry="\\>"):
>     userchars = "-A-Za-z0-9"
>     passchars = "-A-Za-z0-9,?;.:/!%$^*&~\"#'"
>     hostchars = "-A-Za-z0-9"
>@@ -327,15 +316,9 @@ text/plain
>     urlpath   = "/[" + pathchars + "]*[^]'.}>) \t\r\n,\\\"]"
>     
>     self.matches['full_uri'] = self._vte.match_add(lboundry + schemes + "//(" + user + "@)?[" + hostchars  +".]+(:[0-9]+)?(" + urlpath + ")?" + rboundry + "/?")
>-
>-    # FreeBSD works with [[:<:]], Linux works with \<
>-    if self.matches['full_uri'] == -1:
>-      if lboundry != "\\<":
>-        self.add_matches(lboundry = "\\<", rboundry = "\\>")
>-    else:
>-      self.matches['addr_only'] = self._vte.match_add (lboundry + "(www|ftp)[" + hostchars + "]*\.[" + hostchars + ".]+(:[0-9]+)?(" + urlpath + ")?" + rboundry + "/?")
>-      self.matches['email'] = self._vte.match_add (lboundry + "(mailto:)?[a-zA-Z0-9][a-zA-Z0-9.+-]*@[a-zA-Z0-9][a-zA-Z0-9-]*\.[a-zA-Z0-9][a-zA-Z0-9-]+[.a-zA-Z0-9-]*" + rboundry)
>-      self.matches['nntp'] = self._vte.match_add (lboundry + '''news:[-A-Z\^_a-z{|}~!"#$%&'()*+,./0-9;:=?`]+@[-A-Za-z0-9.]+(:[0-9]+)?''' + rboundry)
>+    self.matches['addr_only'] = self._vte.match_add (lboundry + "(www|ftp)[" + hostchars + "]*\.[" + hostchars + ".]+(:[0-9]+)?(" + urlpath + ")?" + rboundry + "/?")
>+    self.matches['email'] = self._vte.match_add (lboundry + "(mailto:)?[a-zA-Z0-9][a-zA-Z0-9.+-]*@[a-zA-Z0-9][a-zA-Z0-9-]*\.[a-zA-Z0-9][a-zA-Z0-9-]+[.a-zA-Z0-9-]*" + rboundry)
>+    self.matches['nntp'] = self._vte.match_add (lboundry + '''news:[-A-Z\^_a-z{|}~!"#$%&'()*+,./0-9;:=?`]+@[-A-Za-z0-9.]+(:[0-9]+)?''' + rboundry)
> 
>   def spawn_child (self, event=None):
>     update_records = self.conf.update_records

Actions: View | Diff

Attachments on bug 454207: 311631