svn commit: r1369244 - in /lucene/dev/branches/branch_4x: ./ dev-tools/ dev-tools/scripts/smokeTestRelease.py

[mi...@apache.org]

Author: mikemccand
Date: Fri Aug  3 22:48:52 2012
New Revision: 1369244

URL: http://svn.apache.org/viewvc?rev=1369244&view=rev
Log:
fixup more python3 issues

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/dev-tools/   (props changed)
    lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py

Modified: lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py?rev=1369244&r1=1369243&r2=1369244&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py Fri Aug  3 22:48:52 2012
@@ -443,6 +443,8 @@ def verifyUnpacked(project, artifact, un
   else:
     extras = ()
 
+  # TODO: if solr, verify lucene/licenses, solr/licenses are present
+
   for e in extras:
     if e not in l:
       raise RuntimeError('%s: %s missing from artifact %s' % (project, e, artifact))
@@ -545,12 +547,12 @@ def readSolrOutput(p, startupEvent, logF
   try:
     while True:
       line = p.readline()
-      if line == '':
+      if len(line) == 0:
         break
       f.write(line)
       f.flush()
       # print 'SOLR: %s' % line.strip()
-      if line.find('Started SocketConnector@0.0.0.0:8983') != -1:
+      if line.decode('UTF-8').find('Started SocketConnector@0.0.0.0:8983') != -1:
         startupEvent.set()
   finally:
     f.close()
@@ -781,7 +783,8 @@ def verifyMavenDigests(artifacts):
       inputFile = open(artifactFile, 'rb')
       while True:
         bytes = inputFile.read(65536)
-        if bytes == '': break
+        if len(bytes) == 0:
+          break
         md5.update(bytes)
         sha1.update(bytes)
       inputFile.close()
@@ -1082,5 +1085,9 @@ def smokeTest(baseURL, version, tmpDir, 
   checkMaven(baseURL, tmpDir, version, isSigned)
 
 if __name__ == '__main__':
-  main()
+  try:
+    main()
+  except:
+    import traceback
+    traceback.print_exc()