gnue common/scripts/gnue-diag.sh forms/MANIFEST...

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 02/10/23 20:26:08

Modified files:
        common/scripts : gnue-diag.sh 
        forms          : MANIFEST.in 
        forms/src      : GFForm.py 
        reports        : MANIFEST.in 
Removed files:
        forms/setupext : __init__.py install_data.py 
        reports/setupext: __init__.py install_data.py 

Log message:
        Removed files no longer needed by setup.py
        Removed reference to PyXML as we no longer require it

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/scripts/gnue-diag.sh.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/MANIFEST.in.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFForm.py.diff?tr1=1.185&tr2=1.186&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/MANIFEST.in.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: gnue/common/scripts/gnue-diag.sh
diff -c gnue/common/scripts/gnue-diag.sh:1.5 
gnue/common/scripts/gnue-diag.sh:1.6
*** gnue/common/scripts/gnue-diag.sh:1.5        Mon Sep 16 16:18:23 2002
--- gnue/common/scripts/gnue-diag.sh    Wed Oct 23 20:26:08 2002
***************
*** 146,152 ****
  print "Version:    %s" % string.replace(sys.version,"\n","\n            ")
  print "Platform:   %s" % sys.platform
  print "sys.path:   %s" % string.join(sys.path[1:],"\n            ")
! print "PyXML:      ",
  
  try:
    from xml.sax import saxutils
--- 146,152 ----
  print "Version:    %s" % string.replace(sys.version,"\n","\n            ")
  print "Platform:   %s" % sys.platform
  print "sys.path:   %s" % string.join(sys.path[1:],"\n            ")
! print "Python XML module:      ",
  
  try:
    from xml.sax import saxutils
Index: gnue/forms/MANIFEST.in
diff -c gnue/forms/MANIFEST.in:1.15 gnue/forms/MANIFEST.in:1.16
*** gnue/forms/MANIFEST.in:1.15 Mon Jun  3 18:45:29 2002
--- gnue/forms/MANIFEST.in      Wed Oct 23 20:26:08 2002
***************
*** 11,16 ****
  include setup.cfg.in
  include scripts/gnue-forms.in
  recursive-include samples *
- recursive-include setupext *
  recursive-include doc *.txt *.pdf
  include man/*.1
--- 11,15 ----
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.185 gnue/forms/src/GFForm.py:1.186
*** gnue/forms/src/GFForm.py:1.185      Tue Oct 22 16:42:04 2002
--- gnue/forms/src/GFForm.py    Wed Oct 23 20:26:08 2002
***************
*** 535,540 ****
--- 535,568 ----
            keepNext = 1
            continue
  
+ <<<<<<< GFForm.py
+   def _getFocusableEntries (self, children):
+     # I *hate* debug
+     # GDebug.printMesg (5, )
+     
+     entryNo= 0
+     result= children
+     for entry in children:
+       # shouldn't this be 'in containers'?
+       if entry._type == 'GFBox':
+         next= _getFocusableEntries (entry._children)
+         # replace the box with its children recursively
+         result= result[:entryNo]+next+result[entryNo+1:]
+         entryNo= entryNo+length (next)
+       entryNo= entryNo+1
+     return result
+   
+ #        if keepNext == 1:
+ #          nextEntry = object
+ #          break
+ #
+ #    if nextEntry == firstEntry and self._currentBlock.transparentBlock:
+ #      # Jump to the next block if block is tagged as transparent
+ #      self.nextBlock()
+ #    firstEntry= self._currentEntry
+ #    else:
+ #      self.changeFocus(nextEntry)
+ =======
          if keepNext == 1:
            nextEntry = object
            break
***************
*** 544,549 ****
--- 572,578 ----
        self.nextBlock()
      else:
        self.changeFocus(nextEntry)
+ >>>>>>> 1.183
  
    #
    # previousEntry
Index: gnue/reports/MANIFEST.in
diff -c gnue/reports/MANIFEST.in:1.4 gnue/reports/MANIFEST.in:1.5
*** gnue/reports/MANIFEST.in:1.4        Mon Jun  3 18:36:39 2002
--- gnue/reports/MANIFEST.in    Wed Oct 23 20:26:08 2002
***************
*** 12,18 ****
  recursive-include man *.1
  recursive-include scripts *.in
  recursive-include samples *
- recursive-include setupext *
  recursive-include doc *.txt *.pdf
  recursive-include filters *
  recursive-include adapters *
--- 12,17 ----