[Treepkg-commits] r484 - in trunk: test treepkg

[scm-commit@wald.intevation.org]

Author: bricks
Date: 2010-11-10 17:48:03 +0100 (Wed, 10 Nov 2010)
New Revision: 484

Modified:
   trunk/test/test_readconfig.py
   trunk/treepkg/readconfig.py
Log:
use empty string as default config values instead of None


Modified: trunk/test/test_readconfig.py
===================================================================
--- trunk/test/test_readconfig.py	2010-11-10 16:46:12 UTC (rev 483)
+++ trunk/test/test_readconfig.py	2010-11-10 16:48:03 UTC (rev 484)
@@ -120,7 +120,7 @@
                  branch="",
                  builder_cls="PBuilder",
                  os="bar os",
-                 svn_url=None,
+                 svn_url="",
                  scm_type="svn",
                  rules_scm_type="svn",
                  status_hook="echo extra hook"),
@@ -146,7 +146,7 @@
                  branch="",
                  builder_cls="PBuilder",
                  os="foo os",
-                 svn_url=None,
+                 svn_url="",
                  scm_type="svn",
                  rules_scm_type="svn",
                  status_hook="echo simple hook")])

Modified: trunk/treepkg/readconfig.py
===================================================================
--- trunk/treepkg/readconfig.py	2010-11-10 16:46:12 UTC (rev 483)
+++ trunk/treepkg/readconfig.py	2010-11-10 16:48:03 UTC (rev 484)
@@ -67,7 +67,7 @@
 packager_desc = [
     "name", "base_dir",
     ("url", str, ""),
-    ("svn_url", str, None),
+    ("svn_url", str, ""),
     ("svn_subset", convert_subversion_subset, ""),
     ("svn_externals", shlex.split, ""),
     ("rules_url", str, ""), ("packager_class", str, "treepkg.packager"),
@@ -90,8 +90,8 @@
     ("check_interval", int),
     "instructions_file",
     ("name", str, ""),
-    ("treepkg_dir", str, None),
-    ("tracks_dir", str, None)
+    ("treepkg_dir", str, ""),
+    ("tracks_dir", str, "")
     ]