[Lyntin-cvs] CVS: lyntinng action.py,1.27,1.28 alias.py,1.15,1.16 gag.py,1.14,1.15 highlight.py,1.20,1.21 session.py,1.50,1.51 utils.py,1.28,1.29

[will g. <wil...@us...>]

Update of /cvsroot/lyntin/lyntinng
In directory usw-pr-cvs1:/tmp/cvs-serv3371

Modified Files:
	action.py alias.py gag.py highlight.py session.py utils.py 
Log Message:
Fixed a bunch of the copy issues and a bug in highlight.


Index: action.py
===================================================================
RCS file: /cvsroot/lyntin/lyntinng/action.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** action.py	16 May 2002 14:27:45 -0000	1.27
--- action.py	18 May 2002 03:45:59 -0000	1.28
***************
*** 11,15 ****
  (triggers) and expansion of actions.
  """
! import re, string
  import manager, utils, event, lyntin
  
--- 11,15 ----
  (triggers) and expansion of actions.
  """
! import re, string, copy
  import manager, utils, event, lyntin
  
***************
*** 21,24 ****
--- 21,30 ----
    def __init__(self):
      self._actions = {}
+ 
+   def __copy__(self):
+     ac = ActionManager()
+     for mem in self._actions.keys():
+       ac.addAction(mem, self._actions[mem][2])
+     return ac
  
    def _compileAction(self, trigger):

Index: alias.py
===================================================================
RCS file: /cvsroot/lyntin/lyntinng/alias.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** alias.py	16 May 2002 14:27:45 -0000	1.15
--- alias.py	18 May 2002 03:45:59 -0000	1.16
***************
*** 11,16 ****
  compiling, and checking and such.
  """
! import string
! 
  import manager, utils, lyntin, engine
  
--- 11,15 ----
  compiling, and checking and such.
  """
! import string, copy
  import manager, utils, lyntin, engine
  
***************
*** 19,22 ****
--- 18,27 ----
    def __init__(self):
      self._aliases = {}
+ 
+   def __copy__(self):
+     al = AliasManager()
+     for mem in self._aliases.keys():
+       al._aliases[mem] = copy.deepcopy(self._aliases[mem])
+     return al
  
    def addAlias(self, name, expansion):

Index: gag.py
===================================================================
RCS file: /cvsroot/lyntin/lyntinng/gag.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** gag.py	15 May 2002 00:16:55 -0000	1.14
--- gag.py	18 May 2002 03:45:59 -0000	1.15
***************
*** 10,14 ****
  This module defines the GagManager which handles gags in Lyntin.
  """
! import re, string
  import manager, utils, lyntin
  
--- 10,14 ----
  This module defines the GagManager which handles gags in Lyntin.
  """
! import re, string, copy
  import manager, utils, lyntin
  
***************
*** 18,21 ****
--- 18,28 ----
      self._gags = []
      self._gagregexp = None
+ 
+   def __copy__(self):
+     gag = GagManager()
+     for mem in self._gags:
+       gag._gags.append(mem)
+       gag.compileGagRegexp()
+     return gag
  
    def addGag(self, gag):

Index: highlight.py
===================================================================
RCS file: /cvsroot/lyntin/lyntinng/highlight.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** highlight.py	18 May 2002 03:40:44 -0000	1.20
--- highlight.py	18 May 2002 03:45:59 -0000	1.21
***************
*** 194,202 ****
          if memlength > len(textlist[j]):
            memlength -= len(textlist[j])
!           newlist.append(mem)
          else:
            break
        else:
!         newcolor = self.figureColor([mem], newcolor, '')[0]
  
      newlist.append(textlist[j][:memlength])
--- 194,202 ----
          if memlength > len(textlist[j]):
            memlength -= len(textlist[j])
!           newlist.append(textlist[j])
          else:
            break
        else:
!         newcolor = self.figureColor([textlist[j]], newcolor, '')[0]
  
      newlist.append(textlist[j][:memlength])

Index: session.py
===================================================================
RCS file: /cvsroot/lyntin/lyntinng/session.py,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -r1.50 -r1.51
*** session.py	17 May 2002 03:43:27 -0000	1.50
--- session.py	18 May 2002 03:45:59 -0000	1.51
***************
*** 59,63 ****
      """
      ses = Session()
!     ses._managers = copy.copy(self._managers)
      return ses
        
--- 59,64 ----
      """
      ses = Session()
!     for mem in self._managers.keys():
!       ses._managers[mem] = copy.copy(self._managers[mem])
      return ses
        

Index: utils.py
===================================================================
RCS file: /cvsroot/lyntin/lyntinng/utils.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** utils.py	18 May 2002 03:40:44 -0000	1.28
--- utils.py	18 May 2002 03:45:59 -0000	1.29
***************
*** 221,224 ****
--- 221,225 ----
      # a full set of matched braces, we ignore this semi-colon
      # as a split point.
+     # FIXME - we need to take into account \{ and \}
      count = (text[marker:b].count('{') - 
               text[marker:b].count('}'))