You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@creadur.apache.org by rd...@apache.org on 2008/06/28 13:53:29 UTC
svn commit: r672498 - in
/incubator/rat/main/trunk/scan/src/main/org/apache/rat/scan: scanner.py
tests.py
Author: rdonkin
Date: Sat Jun 28 04:53:29 2008
New Revision: 672498
URL: http://svn.apache.org/viewvc?rev=672498&view=rev
Log:
Avoid concatination
Modified:
incubator/rat/main/trunk/scan/src/main/org/apache/rat/scan/scanner.py
incubator/rat/main/trunk/scan/src/main/org/apache/rat/scan/tests.py
Modified: incubator/rat/main/trunk/scan/src/main/org/apache/rat/scan/scanner.py
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/scan/src/main/org/apache/rat/scan/scanner.py?rev=672498&r1=672497&r2=672498&view=diff
==============================================================================
--- incubator/rat/main/trunk/scan/src/main/org/apache/rat/scan/scanner.py (original)
+++ incubator/rat/main/trunk/scan/src/main/org/apache/rat/scan/scanner.py Sat Jun 28 04:53:29 2008
@@ -65,8 +65,8 @@
self.__load()
return self.__sha
- def writeXml(self, result):
- result = result + " <document dir='" + self.dir + "' name='" + self.name + "' >\n"
+ def toXml(self):
+ result = " <document dir='" + self.dir + "' name='" + self.name + "' >\n"
result = result + " <md5>" + self.md5() + "</md5>\n"
result = result + " <sha512>" + self.sha() + "</sha512>\n"
result = result + " <ripemd160>" + self.ripe() + "</ripemd160>\n"
@@ -97,7 +97,7 @@
pass
elif not (ext == '.sha1' or ext == '.md5' or ext=='.sha' or ext == '.asc'):
document = Document(root, name)
- result = document.writeXml(result);
+ result = result + document.toXml();
if '.svn' in dirs:
dirs.remove('.svn')
result = result + "</documents>"
Modified: incubator/rat/main/trunk/scan/src/main/org/apache/rat/scan/tests.py
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/scan/src/main/org/apache/rat/scan/tests.py?rev=672498&r1=672497&r2=672498&view=diff
==============================================================================
--- incubator/rat/main/trunk/scan/src/main/org/apache/rat/scan/tests.py (original)
+++ incubator/rat/main/trunk/scan/src/main/org/apache/rat/scan/tests.py Sat Jun 28 04:53:29 2008
@@ -159,7 +159,7 @@
self.assertEquals("2ae73f5cfe7943a7d51b46e653948af7f067a6b01e61c827201c8e17b9231956f48b3e8e0da64e822ca9fdeb7a62f5af623406e2dbb9b39a8dabf569d2046402", self.document.sha())
def testXml(self):
- self.assertEquals(" <document dir='../../../../../test/org/apache/rat/scan/' name='Sample.txt' >\n <md5>c81f4cd3b2203ae869b8c6acea6bf73c</md5>\n <sha512>2ae73f5cfe7943a7d51b46e653948af7f067a6b01e61c827201c8e17b9231956f48b3e8e0da64e822ca9fdeb7a62f5af623406e2dbb9b39a8dabf569d2046402</sha512>\n <ripemd160>4b0a5f9317e0d3165ea4982f90e7266a553d8353</ripemd160>\n </document>\n", self.document.writeXml(""))
+ self.assertEquals(" <document dir='../../../../../test/org/apache/rat/scan/' name='Sample.txt' >\n <md5>c81f4cd3b2203ae869b8c6acea6bf73c</md5>\n <sha512>2ae73f5cfe7943a7d51b46e653948af7f067a6b01e61c827201c8e17b9231956f48b3e8e0da64e822ca9fdeb7a62f5af623406e2dbb9b39a8dabf569d2046402</sha512>\n <ripemd160>4b0a5f9317e0d3165ea4982f90e7266a553d8353</ripemd160>\n </document>\n", self.document.toXml())
class ScanScannerTest(unittest.TestCase):