Merge branch '2.4.5' of ssh://git.tasktools.org/tm/task into 2.4.5

This commit is contained in:
Paul Beckingham
2015-07-03 21:01:58 -04:00
6 changed files with 14 additions and 7 deletions

View File

@@ -48,7 +48,7 @@ class TestExportCommand(TestCase):
self.t(('add', 'test'))
def export(self, identifier):
return json.loads(self.t((str(identifier), 'export'))[1].strip())
return json.loads(self.t((str(identifier), 'rc.json.array=off', 'export'))[1].strip())
def assertType(self, value, type):
self.assertEqual(isinstance(value, type), True)

View File

@@ -44,7 +44,8 @@ $source_dir =~ s{[^/]+$}{..};
if (open my $fh, '>', $rc)
{
print $fh "data.location=.\n",
"verbose=no\n";
"verbose=no\n",
"json.array=off";
close $fh;
}

View File

@@ -44,7 +44,8 @@ if (open my $fh, '>', $rc)
"verbose=off\n",
"confirmation=no\n",
"defaultwidth=100\n",
"dateformat=m/d/Y\n";
"dateformat=m/d/Y\n",
"json.array=off";
close $fh;
}