[Checkins] SVN: bluebream/branches/ccomb-merge-templates/ don't print the directories, and sort the result

Christophe Combelles ccomb at free.fr
Tue Mar 30 19:27:03 EDT 2010


Log message for revision 110347:
  don't print the directories, and sort the result
  

Changed:
  U   bluebream/branches/ccomb-merge-templates/CHANGES.txt
  U   bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/tests/bluebream.txt

-=-
Modified: bluebream/branches/ccomb-merge-templates/CHANGES.txt
===================================================================
--- bluebream/branches/ccomb-merge-templates/CHANGES.txt	2010-03-30 23:23:32 UTC (rev 110346)
+++ bluebream/branches/ccomb-merge-templates/CHANGES.txt	2010-03-30 23:27:02 UTC (rev 110347)
@@ -8,7 +8,7 @@
 
 - Use project name as i18n_domain in base template
 
-- Merge the `bluebream_simple` with the defaut template by allowing to create a
+- Merge the two templates into a single one by allowing to create a
   flat or nested namespace structure, depending on the project name.
 
 1.0a5 (2010-03-28)

Modified: bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/tests/bluebream.txt
===================================================================
--- bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/tests/bluebream.txt	2010-03-30 23:23:32 UTC (rev 110346)
+++ bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/tests/bluebream.txt	2010-03-30 23:27:02 UTC (rev 110347)
@@ -9,14 +9,11 @@
 
 >>> import os
 >>> def print_dir(d):
-...     for a,b,c in os.walk(d):
-...         # Hack for http://trac.pythonpaste.org/pythonpaste/ticket/414
-...         if not a.endswith('.pyo'):
-...             print a
-...         for f in c:
+...     for dirpath, dirnames, filenames in sorted(os.walk(d)):
+...         for filename in sorted(filenames):
 ...             # Hack for http://trac.pythonpaste.org/pythonpaste/ticket/414
-...             if not f.endswith('.pyo'):
-...                 print os.path.join(a,f)
+...             if not filename.endswith('.pyo'):
+...                 print os.path.join(dirpath,filename)
 
 >>> from paste.script import command
 >>> project = 'sample'
@@ -58,46 +55,34 @@
 Creating directory ./sample
 
 >>> print_dir('sample')
-sample
+sample/bootstrap.py
+sample/buildout.cfg
 sample/debug.ini
+sample/deploy.ini
 sample/setup.py
-sample/buildout.cfg
-sample/bootstrap.py
 sample/versions.cfg
-sample/deploy.ini
-sample/etc
 sample/etc/site.zcml
-sample/src
-sample/src/sample
 sample/src/sample/__init__.py
 sample/src/sample/configure.zcml
-sample/src/sample/startup.py
 sample/src/sample/debug.py
 sample/src/sample/securitypolicy.zcml
-sample/src/sample/tests
-sample/src/sample/tests/ftesting.zcml
+sample/src/sample/startup.py
+sample/src/sample.egg-info/PKG-INFO
 sample/src/sample/tests/__init__.py
+sample/src/sample/tests/ftesting.zcml
 sample/src/sample/tests/tests.py
-sample/src/sample/welcome
-sample/src/sample/welcome/ftests.txt
 sample/src/sample/welcome/__init__.py
+sample/src/sample/welcome/app.py
+sample/src/sample/welcome/configure.zcml
+sample/src/sample/welcome/ftests.txt
 sample/src/sample/welcome/index.pt
 sample/src/sample/welcome/interfaces.py
-sample/src/sample/welcome/configure.zcml
-sample/src/sample/welcome/app.py
 sample/src/sample/welcome/views.py
-sample/src/sample/welcome/static
-sample/src/sample/welcome/static/style.css
 sample/src/sample/welcome/static/logo.png
-sample/src/sample.egg-info
-sample/src/sample.egg-info/PKG-INFO
-sample/var
-sample/var/filestorage
+sample/src/sample/welcome/static/style.css
+sample/templates/zope_conf.in
 sample/var/filestorage/README.txt
-sample/var/log
 sample/var/log/README.txt
-sample/templates
-sample/templates/zope_conf.in
 
 
 We can also create a project with a namespace:
@@ -143,57 +128,45 @@
 Creating directory ./sample.main
 
 >>> print_dir('sample.main')
-sample.main
+sample.main/bootstrap.py
+sample.main/buildout.cfg
 sample.main/debug.ini
+sample.main/deploy.ini
 sample.main/setup.py
-sample.main/buildout.cfg
-sample.main/bootstrap.py
 sample.main/versions.cfg
-sample.main/deploy.ini
-sample.main/etc
 sample.main/etc/site.zcml
-sample.main/src
-sample.main/src/sample.main.egg-info
+sample.main/src/sample/__init__.py
+sample.main/src/sample.main.egg-info/PKG-INFO
 sample.main/src/sample.main.egg-info/SOURCES.txt
 sample.main/src/sample.main.egg-info/dependency_links.txt
-sample.main/src/sample.main.egg-info/PKG-INFO
-sample.main/src/sample.main.egg-info/top_level.txt
-sample.main/src/sample.main.egg-info/namespace_packages.txt
-sample.main/src/sample.main.egg-info/zip-safe
 sample.main/src/sample.main.egg-info/entry_points.txt
+sample.main/src/sample.main.egg-info/namespace_packages.txt
 sample.main/src/sample.main.egg-info/requires.txt
-sample.main/src/sample
-sample.main/src/sample/__init__.py
-sample.main/src/sample/main
+sample.main/src/sample.main.egg-info/top_level.txt
+sample.main/src/sample.main.egg-info/zip-safe
 sample.main/src/sample/main/__init__.py
 sample.main/src/sample/main/configure.zcml
-sample.main/src/sample/main/startup.py
 sample.main/src/sample/main/debug.py
 sample.main/src/sample/main/securitypolicy.zcml
-sample.main/src/sample/main/tests
-sample.main/src/sample/main/tests/ftesting.zcml
+sample.main/src/sample/main/startup.py
 sample.main/src/sample/main/tests/__init__.py
+sample.main/src/sample/main/tests/ftesting.zcml
 sample.main/src/sample/main/tests/tests.py
-sample.main/src/sample/main/welcome
-sample.main/src/sample/main/welcome/ftests.txt
 sample.main/src/sample/main/welcome/__init__.py
+sample.main/src/sample/main/welcome/app.py
+sample.main/src/sample/main/welcome/configure.zcml
+sample.main/src/sample/main/welcome/ftests.txt
 sample.main/src/sample/main/welcome/index.pt
 sample.main/src/sample/main/welcome/interfaces.py
-sample.main/src/sample/main/welcome/configure.zcml
-sample.main/src/sample/main/welcome/app.py
 sample.main/src/sample/main/welcome/views.py
-sample.main/src/sample/main/welcome/static
-sample.main/src/sample/main/welcome/static/style.css
 sample.main/src/sample/main/welcome/static/logo.png
-sample.main/var
-sample.main/var/filestorage
+sample.main/src/sample/main/welcome/static/style.css
+sample.main/templates/zope_conf.in
 sample.main/var/filestorage/README.txt
-sample.main/var/log
 sample.main/var/log/README.txt
-sample.main/templates
-sample.main/templates/zope_conf.in
 
 
+
 Another project with two levels of namespace:
 ---------------------------------------------
 
@@ -237,54 +210,41 @@
 Creating directory ./sample.app.main
 
 >>> print_dir('sample.app.main')
-sample.app.main
+sample.app.main/bootstrap.py
+sample.app.main/buildout.cfg
 sample.app.main/debug.ini
+sample.app.main/deploy.ini
 sample.app.main/setup.py
-sample.app.main/buildout.cfg
-sample.app.main/bootstrap.py
 sample.app.main/versions.cfg
-sample.app.main/deploy.ini
-sample.app.main/etc
 sample.app.main/etc/site.zcml
-sample.app.main/src
-sample.app.main/src/sample.app.main.egg-info
+sample.app.main/src/sample/__init__.py
+sample.app.main/src/sample.app.main.egg-info/PKG-INFO
 sample.app.main/src/sample.app.main.egg-info/SOURCES.txt
 sample.app.main/src/sample.app.main.egg-info/dependency_links.txt
-sample.app.main/src/sample.app.main.egg-info/PKG-INFO
-sample.app.main/src/sample.app.main.egg-info/top_level.txt
-sample.app.main/src/sample.app.main.egg-info/namespace_packages.txt
-sample.app.main/src/sample.app.main.egg-info/zip-safe
 sample.app.main/src/sample.app.main.egg-info/entry_points.txt
+sample.app.main/src/sample.app.main.egg-info/namespace_packages.txt
 sample.app.main/src/sample.app.main.egg-info/requires.txt
-sample.app.main/src/sample
-sample.app.main/src/sample/__init__.py
-sample.app.main/src/sample/app
+sample.app.main/src/sample.app.main.egg-info/top_level.txt
+sample.app.main/src/sample.app.main.egg-info/zip-safe
 sample.app.main/src/sample/app/__init__.py
-sample.app.main/src/sample/app/main
 sample.app.main/src/sample/app/main/__init__.py
 sample.app.main/src/sample/app/main/configure.zcml
-sample.app.main/src/sample/app/main/startup.py
 sample.app.main/src/sample/app/main/debug.py
 sample.app.main/src/sample/app/main/securitypolicy.zcml
-sample.app.main/src/sample/app/main/tests
-sample.app.main/src/sample/app/main/tests/ftesting.zcml
+sample.app.main/src/sample/app/main/startup.py
 sample.app.main/src/sample/app/main/tests/__init__.py
+sample.app.main/src/sample/app/main/tests/ftesting.zcml
 sample.app.main/src/sample/app/main/tests/tests.py
-sample.app.main/src/sample/app/main/welcome
-sample.app.main/src/sample/app/main/welcome/ftests.txt
 sample.app.main/src/sample/app/main/welcome/__init__.py
+sample.app.main/src/sample/app/main/welcome/app.py
+sample.app.main/src/sample/app/main/welcome/configure.zcml
+sample.app.main/src/sample/app/main/welcome/ftests.txt
 sample.app.main/src/sample/app/main/welcome/index.pt
 sample.app.main/src/sample/app/main/welcome/interfaces.py
-sample.app.main/src/sample/app/main/welcome/configure.zcml
-sample.app.main/src/sample/app/main/welcome/app.py
 sample.app.main/src/sample/app/main/welcome/views.py
-sample.app.main/src/sample/app/main/welcome/static
-sample.app.main/src/sample/app/main/welcome/static/style.css
 sample.app.main/src/sample/app/main/welcome/static/logo.png
-sample.app.main/var
-sample.app.main/var/filestorage
+sample.app.main/src/sample/app/main/welcome/static/style.css
+sample.app.main/templates/zope_conf.in
 sample.app.main/var/filestorage/README.txt
-sample.app.main/var/log
 sample.app.main/var/log/README.txt
-sample.app.main/templates
-sample.app.main/templates/zope_conf.in
+



More information about the checkins mailing list