Mailing List Archive

Log message for revision 41383:
Added '_darcs' to skipped files. Factor the list out.

Changed:
U GenericSetup/trunk/context.py
U GenericSetup/trunk/differ.py
U GenericSetup/trunk/interfaces.py
U GenericSetup/trunk/tool.py

-=-
Modified: GenericSetup/trunk/context.py
===================================================================
--- GenericSetup/trunk/context.py 2006-01-20 12:56:59 UTC (rev 41382)
+++ GenericSetup/trunk/context.py 2006-01-20 13:49:16 UTC (rev 41383)
@@ -42,6 +42,7 @@
from interfaces import IExportContext
from interfaces import IImportContext
from interfaces import IWriteLogger
+from interfaces import SKIPPED_FILES
from permissions import ManagePortal


@@ -216,7 +217,7 @@
return os.path.isdir( full_path )

security.declareProtected( ManagePortal, 'listDirectory' )
- def listDirectory( self, path, skip=('CVS', '.svn', '_svn') ):
+ def listDirectory( self, path, skip=SKIPPED_FILES ):

""" See IImportContext.
"""
@@ -315,7 +316,7 @@
if info is not None:
return info.isdir()

- def listDirectory( self, path, skip=('CVS', '.svn', '_svn') ):
+ def listDirectory( self, path, skip=SKIPPED_FILES ):

""" See IImportContext.
"""

Modified: GenericSetup/trunk/differ.py
===================================================================
--- GenericSetup/trunk/differ.py 2006-01-20 12:56:59 UTC (rev 41382)
+++ GenericSetup/trunk/differ.py 2006-01-20 13:49:16 UTC (rev 41383)
@@ -21,6 +21,8 @@
from Globals import InitializeClass
from AccessControl import ClassSecurityInfo

+from interfaces import SKIPPED_FILES
+
BLANKS_REGEX = re.compile( r'^\s*$' )

def unidiff( a
@@ -95,7 +97,7 @@
, rhs
, missing_as_empty=False
, ignore_blanks=False
- , skip=('CVS', '.svn', '_svn')
+ , skip=SKIPPED_FILES
):
self._lhs = lhs
self._rhs = rhs

Modified: GenericSetup/trunk/interfaces.py
===================================================================
--- GenericSetup/trunk/interfaces.py 2006-01-20 12:56:59 UTC (rev 41382)
+++ GenericSetup/trunk/interfaces.py 2006-01-20 13:49:16 UTC (rev 41383)
@@ -20,6 +20,7 @@
from zope.schema import TextLine

BASE, EXTENSION = range(1, 3)
+SKIPPED_FILES = ('CVS', '.svn', '_svn', '_darcs')


class IPseudoInterface( Interface ):
@@ -119,7 +120,7 @@
bool.
"""

- def listDirectory( path, skip=('CVS', '.svn', '_svn') ):
+ def listDirectory( path, skip=SKIPPED_FILES ):

""" List IDs of the contents of a directory / folder.


Modified: GenericSetup/trunk/tool.py
===================================================================
--- GenericSetup/trunk/tool.py 2006-01-20 12:56:59 UTC (rev 41382)
+++ GenericSetup/trunk/tool.py 2006-01-20 13:49:16 UTC (rev 41383)
@@ -30,6 +30,7 @@

from interfaces import EXTENSION
from interfaces import ISetupTool
+from interfaces import SKIPPED_FILES
from permissions import ManagePortal
from context import DirectoryImportContext
from context import SnapshotImportContext
@@ -298,7 +299,7 @@
rhs_context,
missing_as_empty=False,
ignore_blanks=False,
- skip=('CVS', '.svn', '_svn'),
+ skip=SKIPPED_FILES,
):
""" See ISetupTool.
"""

_______________________________________________
Zope-CVS maillist - Zope-CVS@zope.org
http://mail.zope.org/mailman/listinfo/zope-cvs

Zope CVS instructions: http://dev.zope.org/CVS