Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > CVS update: /leo/plugins/

leo
Discussion topic

Back to topic list

CVS update: /leo/plugins/

Author bwmulder
Full name Bernhard Mulder
Date 2006-08-01 22:59:35 PDT
Message User: bwmulder
Date: 2006-08-01 22:59:35-0700
Modified:
   leo/plugins/mod_shadow.py
   leo/plugins/mod_shadow_core.py

Log:
 Fix / complete Edwards mod shadow changes

File Changes:

Directory: /leo/plugins/
========================

File [changed]: mod_shadow.py
Url: http://leo.tigris.or​g/source/browse/leo/​plugins/mod_shadow.p​y?r1=1.13&r2=1.1​4
Delta lines: +15 -10
---------------------
--- mod_shadow.py 2006-08-01 09:14:12-0700 1.13
+++ mod_shadow.py 2006-08-01 22:59:33-0700 1.14
@@ -97,10 +97,10 @@
 #@nl
 #@<< globals >>
 #@+node:ekr.20060715​100156.55:<< globals >>
-__version__ = "$Rev: 2900 $"
+__version__ = "$Rev: 3076 $"
 __author__ = "Bernhard Mulder"
-__date__ = "$Date: 2006/08/01 16:14:12 $"
-__cvsid__ = "$Id: mod_shadow.py,v 1.13 2006/08/01 16:14:12 edream Exp $"
+__date__ = "$Date: 2006/08/02 05:59:33 $"
+__cvsid__ = "$Id: mod_shadow.py,v 1.14 2006/08/02 05:59:33 bwmulder Exp $"
 #@-node:ekr.20060715​100156.55:<< globals >>
 #@nl
 #@<< Notes >>
@@ -175,6 +175,10 @@
 
 plugins_path = g.os_path_join(g.app​.loadDir,"..","plugi​ns")
 mod_shadow_core = g.importFromPath('mo​d_shadow_core',plugi​ns_path)
+
+shadow_subdir_default = 'LeoFolder'
+shadow_prefix_default = ''
+
 #@nonl
 #@-node:ekr.20060801​095508:<< imports >>
 #@nl
@@ -277,8 +281,8 @@
             update the shadow file from the real file.
     """
     c = self.c
- shadow_subdir = c.config.getString('​shadow_subdir') or ''
- shadow_prefix = c.config.getString('​shadow_prefix') or ''
+ shadow_subdir = c.config.getString('​shadow_subdir') or shadow_subdir_default
+ shadow_prefix = c.config.getString('​shadow_prefix') or shadow_prefix_default
     shadow_verbosity = getVerbosity(c)
     try:
         dir, simplename = os.path.split(filename)
@@ -319,8 +323,8 @@
           and update the real file after the close.
     """
     c = self.c
- shadow_subdir = c.config.getString('​shadow_subdir') or ''
- shadow_prefix = c.config.getString('​shadow_prefix') or ''
+ shadow_subdir = c.config.getString('​shadow_subdir') or shadow_subdir_default
+ shadow_prefix = c.config.getString('​shadow_prefix') or shadow_prefix_default
     shadow_verbosity = getVerbosity(c)
     dir, simplename = os.path.split(filename)
     rootname, ext = os.path.splitext(simplename)
@@ -345,8 +349,8 @@
     shadow file number -> real file number.
     """
     try:
- shadow_subdir = c.config.getString('​shadow_subdir') or ''
- shadow_prefix = c.config.getString('​shadow_prefix') or ''
+ shadow_subdir = self.config.getStrin​g('shadow_subdir') or shadow_subdir_default
+ shadow_prefix = self.config.getStrin​g('shadow_prefix') or shadow_prefix_default
         dir, simplename = os.path.split(filename)
         shadow_filename = os.path.join(dir,sha​dow_subdir,shadow_pr​efix + simplename)
         if os.path.exists(shado​w_filename):
@@ -399,9 +403,10 @@
     
     # Check if we are dealing with a shadow file
     try:
+ c = self.c
         targetFileName = self.targetFileName
         outputFileName = self.outputFileName
- shadow_subdir = c.config.getString('​shadow_subdir') or ''
+ shadow_subdir = c.config.getString('​shadow_subdir') or shadow_subdir_default
         shadow_verbosity = getVerbosity(c)
         if self.writing_to_shad​ow_directory:
             self.targetFileName = self.shadow_filename

File [changed]: mod_shadow_core.py
Url: http://leo.tigris.or​g/source/browse/leo/​plugins/mod_shadow_c​ore.py?r1=1.8&r2​=1.9
Delta lines: +3 -4
-------------------
--- mod_shadow_core.py 2006-08-01 09:14:12-0700 1.8
+++ mod_shadow_core.py 2006-08-01 22:59:33-0700 1.9
@@ -22,8 +22,8 @@
 
 __version__ = "$Rev: 1765 $"
 __author__ = "Bernhard Mulder"
-__date__ = "$Date: 2006/08/01 16:14:12 $"
-__cvsid__ = "$Id: mod_shadow_core.py,v 1.8 2006/08/01 16:14:12 edream Exp $"
+__date__ = "$Date: 2006/08/02 05:59:33 $"
+__cvsid__ = "$Id: mod_shadow_core.py,v 1.9 2006/08/02 05:59:33 bwmulder Exp $"
 #@-node:ekr.20060715​100156.10:<< globals >>
 #@nl
 
@@ -305,10 +305,9 @@
     """
     #@ @+others
     #@+node:ekr.20060715​100156.37:__init__
- def __init__(self, c, es, nullObject):
+ def __init__(self, es, nullObject):
         self.es = es
         self.nullObject = nullObject
- self.c = c
     #@-node:ekr.20060715​100156.37:__init__
     #@+node:ekr.20060715​100156.38:check_line​s_for_equality
     def check_lines_for_equality (self, lines1, lines2, message, lines1_message, lines2_message, es):

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

CVS update: /leo/plugins/ bwmulder Bernhard Mulder 2006-08-01 22:59:35 PDT
Messages per page: