accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [02/16] ACCUMULO-2773 Regenerate sources for Thrift 0.9.1
Date Fri, 02 May 2014 23:12:47 GMT
http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/proxy/src/main/python/AccumuloProxy.py
----------------------------------------------------------------------
diff --git a/proxy/src/main/python/AccumuloProxy.py b/proxy/src/main/python/AccumuloProxy.py
index c74ee96..37dda0f 100644
--- a/proxy/src/main/python/AccumuloProxy.py
+++ b/proxy/src/main/python/AccumuloProxy.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Autogenerated by Thrift Compiler (0.9.0)
+# Autogenerated by Thrift Compiler (0.9.1)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -734,7 +734,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_login(self, ):
+  def recv_login(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -770,7 +770,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_addConstraint(self, ):
+  def recv_addConstraint(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -810,7 +810,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_addSplits(self, ):
+  def recv_addSplits(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -850,7 +850,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_attachIterator(self, ):
+  def recv_attachIterator(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -890,7 +890,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_checkIteratorConflicts(self, ):
+  def recv_checkIteratorConflicts(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -926,7 +926,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_clearLocatorCache(self, ):
+  def recv_clearLocatorCache(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -966,7 +966,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_cloneTable(self, ):
+  def recv_cloneTable(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -1014,7 +1014,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_compactTable(self, ):
+  def recv_compactTable(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -1050,7 +1050,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_cancelCompaction(self, ):
+  def recv_cancelCompaction(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -1090,7 +1090,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_createTable(self, ):
+  def recv_createTable(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -1126,7 +1126,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_deleteTable(self, ):
+  def recv_deleteTable(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -1166,7 +1166,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_deleteRows(self, ):
+  def recv_deleteRows(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -1204,7 +1204,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_exportTable(self, ):
+  def recv_exportTable(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -1246,7 +1246,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_flushTable(self, ):
+  def recv_flushTable(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -1282,7 +1282,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_getDiskUsage(self, ):
+  def recv_getDiskUsage(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -1320,7 +1320,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_getLocalityGroups(self, ):
+  def recv_getLocalityGroups(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -1362,7 +1362,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_getIteratorSetting(self, ):
+  def recv_getIteratorSetting(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -1410,7 +1410,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_getMaxRow(self, ):
+  def recv_getMaxRow(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -1448,7 +1448,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_getTableProperties(self, ):
+  def recv_getTableProperties(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -1492,7 +1492,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_importDirectory(self, ):
+  def recv_importDirectory(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -1530,7 +1530,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_importTable(self, ):
+  def recv_importTable(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -1568,7 +1568,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_listSplits(self, ):
+  def recv_listSplits(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -1604,7 +1604,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_listTables(self, ):
+  def recv_listTables(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -1636,7 +1636,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_listIterators(self, ):
+  def recv_listIterators(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -1674,7 +1674,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_listConstraints(self, ):
+  def recv_listConstraints(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -1716,7 +1716,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_mergeTablets(self, ):
+  def recv_mergeTablets(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -1754,7 +1754,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_offlineTable(self, ):
+  def recv_offlineTable(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -1792,7 +1792,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_onlineTable(self, ):
+  def recv_onlineTable(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -1830,7 +1830,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_removeConstraint(self, ):
+  def recv_removeConstraint(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -1870,7 +1870,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_removeIterator(self, ):
+  def recv_removeIterator(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -1908,7 +1908,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_removeTableProperty(self, ):
+  def recv_removeTableProperty(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -1946,7 +1946,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_renameTable(self, ):
+  def recv_renameTable(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -1986,7 +1986,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_setLocalityGroups(self, ):
+  def recv_setLocalityGroups(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -2026,7 +2026,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_setTableProperty(self, ):
+  def recv_setTableProperty(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -2066,7 +2066,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_splitRangeByTablets(self, ):
+  def recv_splitRangeByTablets(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -2104,7 +2104,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_tableExists(self, ):
+  def recv_tableExists(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -2134,7 +2134,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_tableIdMap(self, ):
+  def recv_tableIdMap(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -2170,7 +2170,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_testTableClassLoad(self, ):
+  def recv_testTableClassLoad(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -2208,7 +2208,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_pingTabletServer(self, ):
+  def recv_pingTabletServer(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -2242,7 +2242,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_getActiveScans(self, ):
+  def recv_getActiveScans(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -2278,7 +2278,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_getActiveCompactions(self, ):
+  def recv_getActiveCompactions(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -2312,7 +2312,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_getSiteConfiguration(self, ):
+  def recv_getSiteConfiguration(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -2346,7 +2346,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_getSystemConfiguration(self, ):
+  def recv_getSystemConfiguration(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -2380,7 +2380,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_getTabletServers(self, ):
+  def recv_getTabletServers(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -2412,7 +2412,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_removeProperty(self, ):
+  def recv_removeProperty(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -2448,7 +2448,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_setProperty(self, ):
+  def recv_setProperty(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -2484,7 +2484,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_testClassLoad(self, ):
+  def recv_testClassLoad(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -2522,7 +2522,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_authenticateUser(self, ):
+  def recv_authenticateUser(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -2560,7 +2560,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_changeUserAuthorizations(self, ):
+  def recv_changeUserAuthorizations(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -2596,7 +2596,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_changeLocalUserPassword(self, ):
+  def recv_changeLocalUserPassword(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -2632,7 +2632,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_createLocalUser(self, ):
+  def recv_createLocalUser(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -2666,7 +2666,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_dropLocalUser(self, ):
+  def recv_dropLocalUser(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -2700,7 +2700,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_getUserAuthorizations(self, ):
+  def recv_getUserAuthorizations(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -2738,7 +2738,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_grantSystemPermission(self, ):
+  def recv_grantSystemPermission(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -2776,7 +2776,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_grantTablePermission(self, ):
+  def recv_grantTablePermission(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -2814,7 +2814,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_hasSystemPermission(self, ):
+  def recv_hasSystemPermission(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -2854,7 +2854,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_hasTablePermission(self, ):
+  def recv_hasTablePermission(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -2890,7 +2890,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_listLocalUsers(self, ):
+  def recv_listLocalUsers(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -2930,7 +2930,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_revokeSystemPermission(self, ):
+  def recv_revokeSystemPermission(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -2968,7 +2968,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_revokeTablePermission(self, ):
+  def recv_revokeTablePermission(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -3006,7 +3006,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_createBatchScanner(self, ):
+  def recv_createBatchScanner(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -3046,7 +3046,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_createScanner(self, ):
+  def recv_createScanner(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -3082,7 +3082,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_hasNext(self, ):
+  def recv_hasNext(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -3114,7 +3114,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_nextEntry(self, ):
+  def recv_nextEntry(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -3152,7 +3152,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_nextK(self, ):
+  def recv_nextK(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -3188,7 +3188,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_closeScanner(self, ):
+  def recv_closeScanner(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -3222,7 +3222,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_updateAndFlush(self, ):
+  def recv_updateAndFlush(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -3262,7 +3262,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_createWriter(self, ):
+  def recv_createWriter(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -3314,7 +3314,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_flush(self, ):
+  def recv_flush(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -3346,7 +3346,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_closeWriter(self, ):
+  def recv_closeWriter(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -3384,7 +3384,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_updateRowConditionally(self, ):
+  def recv_updateRowConditionally(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -3424,7 +3424,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_createConditionalWriter(self, ):
+  def recv_createConditionalWriter(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -3462,7 +3462,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_updateRowsConditionally(self, ):
+  def recv_updateRowsConditionally(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -3498,7 +3498,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_closeConditionalWriter(self, ):
+  def recv_closeConditionalWriter(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -3526,7 +3526,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_getRowRange(self, ):
+  def recv_getRowRange(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -3558,7 +3558,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_getFollowing(self, ):
+  def recv_getFollowing(self):
     (fname, mtype, rseqid) = self._iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
       x = TApplicationException()
@@ -3677,7 +3677,7 @@ class Processor(Iface, TProcessor):
     result = login_result()
     try:
       result.success = self._handler.login(args.principal, args.loginProperties)
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
     oprot.writeMessageBegin("login", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -3691,11 +3691,11 @@ class Processor(Iface, TProcessor):
     result = addConstraint_result()
     try:
       result.success = self._handler.addConstraint(args.login, args.tableName, args.constraintClassName)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("addConstraint", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -3709,11 +3709,11 @@ class Processor(Iface, TProcessor):
     result = addSplits_result()
     try:
       self._handler.addSplits(args.login, args.tableName, args.splits)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("addSplits", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -3727,11 +3727,11 @@ class Processor(Iface, TProcessor):
     result = attachIterator_result()
     try:
       self._handler.attachIterator(args.login, args.tableName, args.setting, args.scopes)
-    except AccumuloSecurityException as ouch1:
+    except AccumuloSecurityException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloException as ouch2:
+    except AccumuloException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("attachIterator", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -3745,11 +3745,11 @@ class Processor(Iface, TProcessor):
     result = checkIteratorConflicts_result()
     try:
       self._handler.checkIteratorConflicts(args.login, args.tableName, args.setting, args.scopes)
-    except AccumuloSecurityException as ouch1:
+    except AccumuloSecurityException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloException as ouch2:
+    except AccumuloException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("checkIteratorConflicts", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -3763,7 +3763,7 @@ class Processor(Iface, TProcessor):
     result = clearLocatorCache_result()
     try:
       self._handler.clearLocatorCache(args.login, args.tableName)
-    except TableNotFoundException as ouch1:
+    except TableNotFoundException, ouch1:
       result.ouch1 = ouch1
     oprot.writeMessageBegin("clearLocatorCache", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -3777,13 +3777,13 @@ class Processor(Iface, TProcessor):
     result = cloneTable_result()
     try:
       self._handler.cloneTable(args.login, args.tableName, args.newTableName, args.flush, args.propertiesToSet, args.propertiesToExclude)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
-    except TableExistsException as ouch4:
+    except TableExistsException, ouch4:
       result.ouch4 = ouch4
     oprot.writeMessageBegin("cloneTable", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -3797,11 +3797,11 @@ class Processor(Iface, TProcessor):
     result = compactTable_result()
     try:
       self._handler.compactTable(args.login, args.tableName, args.startRow, args.endRow, args.iterators, args.flush, args.wait)
-    except AccumuloSecurityException as ouch1:
+    except AccumuloSecurityException, ouch1:
       result.ouch1 = ouch1
-    except TableNotFoundException as ouch2:
+    except TableNotFoundException, ouch2:
       result.ouch2 = ouch2
-    except AccumuloException as ouch3:
+    except AccumuloException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("compactTable", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -3815,11 +3815,11 @@ class Processor(Iface, TProcessor):
     result = cancelCompaction_result()
     try:
       self._handler.cancelCompaction(args.login, args.tableName)
-    except AccumuloSecurityException as ouch1:
+    except AccumuloSecurityException, ouch1:
       result.ouch1 = ouch1
-    except TableNotFoundException as ouch2:
+    except TableNotFoundException, ouch2:
       result.ouch2 = ouch2
-    except AccumuloException as ouch3:
+    except AccumuloException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("cancelCompaction", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -3833,11 +3833,11 @@ class Processor(Iface, TProcessor):
     result = createTable_result()
     try:
       self._handler.createTable(args.login, args.tableName, args.versioningIter, args.type)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableExistsException as ouch3:
+    except TableExistsException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("createTable", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -3851,11 +3851,11 @@ class Processor(Iface, TProcessor):
     result = deleteTable_result()
     try:
       self._handler.deleteTable(args.login, args.tableName)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("deleteTable", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -3869,11 +3869,11 @@ class Processor(Iface, TProcessor):
     result = deleteRows_result()
     try:
       self._handler.deleteRows(args.login, args.tableName, args.startRow, args.endRow)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("deleteRows", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -3887,11 +3887,11 @@ class Processor(Iface, TProcessor):
     result = exportTable_result()
     try:
       self._handler.exportTable(args.login, args.tableName, args.exportDir)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("exportTable", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -3905,11 +3905,11 @@ class Processor(Iface, TProcessor):
     result = flushTable_result()
     try:
       self._handler.flushTable(args.login, args.tableName, args.startRow, args.endRow, args.wait)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("flushTable", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -3923,11 +3923,11 @@ class Processor(Iface, TProcessor):
     result = getDiskUsage_result()
     try:
       result.success = self._handler.getDiskUsage(args.login, args.tables)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("getDiskUsage", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -3941,11 +3941,11 @@ class Processor(Iface, TProcessor):
     result = getLocalityGroups_result()
     try:
       result.success = self._handler.getLocalityGroups(args.login, args.tableName)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("getLocalityGroups", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -3959,11 +3959,11 @@ class Processor(Iface, TProcessor):
     result = getIteratorSetting_result()
     try:
       result.success = self._handler.getIteratorSetting(args.login, args.tableName, args.iteratorName, args.scope)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("getIteratorSetting", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -3977,11 +3977,11 @@ class Processor(Iface, TProcessor):
     result = getMaxRow_result()
     try:
       result.success = self._handler.getMaxRow(args.login, args.tableName, args.auths, args.startRow, args.startInclusive, args.endRow, args.endInclusive)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("getMaxRow", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -3995,11 +3995,11 @@ class Processor(Iface, TProcessor):
     result = getTableProperties_result()
     try:
       result.success = self._handler.getTableProperties(args.login, args.tableName)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("getTableProperties", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4013,11 +4013,11 @@ class Processor(Iface, TProcessor):
     result = importDirectory_result()
     try:
       self._handler.importDirectory(args.login, args.tableName, args.importDir, args.failureDir, args.setTime)
-    except TableNotFoundException as ouch1:
+    except TableNotFoundException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloException as ouch3:
+    except AccumuloException, ouch3:
       result.ouch3 = ouch3
-    except AccumuloSecurityException as ouch4:
+    except AccumuloSecurityException, ouch4:
       result.ouch4 = ouch4
     oprot.writeMessageBegin("importDirectory", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4031,11 +4031,11 @@ class Processor(Iface, TProcessor):
     result = importTable_result()
     try:
       self._handler.importTable(args.login, args.tableName, args.importDir)
-    except TableExistsException as ouch1:
+    except TableExistsException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloException as ouch2:
+    except AccumuloException, ouch2:
       result.ouch2 = ouch2
-    except AccumuloSecurityException as ouch3:
+    except AccumuloSecurityException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("importTable", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4049,11 +4049,11 @@ class Processor(Iface, TProcessor):
     result = listSplits_result()
     try:
       result.success = self._handler.listSplits(args.login, args.tableName, args.maxSplits)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("listSplits", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4078,11 +4078,11 @@ class Processor(Iface, TProcessor):
     result = listIterators_result()
     try:
       result.success = self._handler.listIterators(args.login, args.tableName)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("listIterators", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4096,11 +4096,11 @@ class Processor(Iface, TProcessor):
     result = listConstraints_result()
     try:
       result.success = self._handler.listConstraints(args.login, args.tableName)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("listConstraints", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4114,11 +4114,11 @@ class Processor(Iface, TProcessor):
     result = mergeTablets_result()
     try:
       self._handler.mergeTablets(args.login, args.tableName, args.startRow, args.endRow)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("mergeTablets", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4132,11 +4132,11 @@ class Processor(Iface, TProcessor):
     result = offlineTable_result()
     try:
       self._handler.offlineTable(args.login, args.tableName, args.wait)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("offlineTable", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4150,11 +4150,11 @@ class Processor(Iface, TProcessor):
     result = onlineTable_result()
     try:
       self._handler.onlineTable(args.login, args.tableName, args.wait)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("onlineTable", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4168,11 +4168,11 @@ class Processor(Iface, TProcessor):
     result = removeConstraint_result()
     try:
       self._handler.removeConstraint(args.login, args.tableName, args.constraint)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("removeConstraint", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4186,11 +4186,11 @@ class Processor(Iface, TProcessor):
     result = removeIterator_result()
     try:
       self._handler.removeIterator(args.login, args.tableName, args.iterName, args.scopes)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("removeIterator", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4204,11 +4204,11 @@ class Processor(Iface, TProcessor):
     result = removeTableProperty_result()
     try:
       self._handler.removeTableProperty(args.login, args.tableName, args.property)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("removeTableProperty", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4222,13 +4222,13 @@ class Processor(Iface, TProcessor):
     result = renameTable_result()
     try:
       self._handler.renameTable(args.login, args.oldTableName, args.newTableName)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
-    except TableExistsException as ouch4:
+    except TableExistsException, ouch4:
       result.ouch4 = ouch4
     oprot.writeMessageBegin("renameTable", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4242,11 +4242,11 @@ class Processor(Iface, TProcessor):
     result = setLocalityGroups_result()
     try:
       self._handler.setLocalityGroups(args.login, args.tableName, args.groups)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("setLocalityGroups", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4260,11 +4260,11 @@ class Processor(Iface, TProcessor):
     result = setTableProperty_result()
     try:
       self._handler.setTableProperty(args.login, args.tableName, args.property, args.value)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("setTableProperty", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4278,11 +4278,11 @@ class Processor(Iface, TProcessor):
     result = splitRangeByTablets_result()
     try:
       result.success = self._handler.splitRangeByTablets(args.login, args.tableName, args.range, args.maxSplits)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("splitRangeByTablets", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4318,11 +4318,11 @@ class Processor(Iface, TProcessor):
     result = testTableClassLoad_result()
     try:
       result.success = self._handler.testTableClassLoad(args.login, args.tableName, args.className, args.asTypeName)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("testTableClassLoad", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4336,9 +4336,9 @@ class Processor(Iface, TProcessor):
     result = pingTabletServer_result()
     try:
       self._handler.pingTabletServer(args.login, args.tserver)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
     oprot.writeMessageBegin("pingTabletServer", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4352,9 +4352,9 @@ class Processor(Iface, TProcessor):
     result = getActiveScans_result()
     try:
       result.success = self._handler.getActiveScans(args.login, args.tserver)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
     oprot.writeMessageBegin("getActiveScans", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4368,9 +4368,9 @@ class Processor(Iface, TProcessor):
     result = getActiveCompactions_result()
     try:
       result.success = self._handler.getActiveCompactions(args.login, args.tserver)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
     oprot.writeMessageBegin("getActiveCompactions", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4384,9 +4384,9 @@ class Processor(Iface, TProcessor):
     result = getSiteConfiguration_result()
     try:
       result.success = self._handler.getSiteConfiguration(args.login)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
     oprot.writeMessageBegin("getSiteConfiguration", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4400,9 +4400,9 @@ class Processor(Iface, TProcessor):
     result = getSystemConfiguration_result()
     try:
       result.success = self._handler.getSystemConfiguration(args.login)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
     oprot.writeMessageBegin("getSystemConfiguration", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4427,9 +4427,9 @@ class Processor(Iface, TProcessor):
     result = removeProperty_result()
     try:
       self._handler.removeProperty(args.login, args.property)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
     oprot.writeMessageBegin("removeProperty", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4443,9 +4443,9 @@ class Processor(Iface, TProcessor):
     result = setProperty_result()
     try:
       self._handler.setProperty(args.login, args.property, args.value)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
     oprot.writeMessageBegin("setProperty", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4459,9 +4459,9 @@ class Processor(Iface, TProcessor):
     result = testClassLoad_result()
     try:
       result.success = self._handler.testClassLoad(args.login, args.className, args.asTypeName)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
     oprot.writeMessageBegin("testClassLoad", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4475,9 +4475,9 @@ class Processor(Iface, TProcessor):
     result = authenticateUser_result()
     try:
       result.success = self._handler.authenticateUser(args.login, args.user, args.properties)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
     oprot.writeMessageBegin("authenticateUser", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4491,9 +4491,9 @@ class Processor(Iface, TProcessor):
     result = changeUserAuthorizations_result()
     try:
       self._handler.changeUserAuthorizations(args.login, args.user, args.authorizations)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
     oprot.writeMessageBegin("changeUserAuthorizations", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4507,9 +4507,9 @@ class Processor(Iface, TProcessor):
     result = changeLocalUserPassword_result()
     try:
       self._handler.changeLocalUserPassword(args.login, args.user, args.password)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
     oprot.writeMessageBegin("changeLocalUserPassword", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4523,9 +4523,9 @@ class Processor(Iface, TProcessor):
     result = createLocalUser_result()
     try:
       self._handler.createLocalUser(args.login, args.user, args.password)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
     oprot.writeMessageBegin("createLocalUser", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4539,9 +4539,9 @@ class Processor(Iface, TProcessor):
     result = dropLocalUser_result()
     try:
       self._handler.dropLocalUser(args.login, args.user)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
     oprot.writeMessageBegin("dropLocalUser", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4555,9 +4555,9 @@ class Processor(Iface, TProcessor):
     result = getUserAuthorizations_result()
     try:
       result.success = self._handler.getUserAuthorizations(args.login, args.user)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
     oprot.writeMessageBegin("getUserAuthorizations", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4571,9 +4571,9 @@ class Processor(Iface, TProcessor):
     result = grantSystemPermission_result()
     try:
       self._handler.grantSystemPermission(args.login, args.user, args.perm)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
     oprot.writeMessageBegin("grantSystemPermission", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4587,11 +4587,11 @@ class Processor(Iface, TProcessor):
     result = grantTablePermission_result()
     try:
       self._handler.grantTablePermission(args.login, args.user, args.table, args.perm)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("grantTablePermission", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4605,9 +4605,9 @@ class Processor(Iface, TProcessor):
     result = hasSystemPermission_result()
     try:
       result.success = self._handler.hasSystemPermission(args.login, args.user, args.perm)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
     oprot.writeMessageBegin("hasSystemPermission", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4621,11 +4621,11 @@ class Processor(Iface, TProcessor):
     result = hasTablePermission_result()
     try:
       result.success = self._handler.hasTablePermission(args.login, args.user, args.table, args.perm)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("hasTablePermission", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4639,11 +4639,11 @@ class Processor(Iface, TProcessor):
     result = listLocalUsers_result()
     try:
       result.success = self._handler.listLocalUsers(args.login)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("listLocalUsers", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4657,9 +4657,9 @@ class Processor(Iface, TProcessor):
     result = revokeSystemPermission_result()
     try:
       self._handler.revokeSystemPermission(args.login, args.user, args.perm)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
     oprot.writeMessageBegin("revokeSystemPermission", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4673,11 +4673,11 @@ class Processor(Iface, TProcessor):
     result = revokeTablePermission_result()
     try:
       self._handler.revokeTablePermission(args.login, args.user, args.table, args.perm)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("revokeTablePermission", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4691,11 +4691,11 @@ class Processor(Iface, TProcessor):
     result = createBatchScanner_result()
     try:
       result.success = self._handler.createBatchScanner(args.login, args.tableName, args.options)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("createBatchScanner", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4709,11 +4709,11 @@ class Processor(Iface, TProcessor):
     result = createScanner_result()
     try:
       result.success = self._handler.createScanner(args.login, args.tableName, args.options)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("createScanner", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4727,7 +4727,7 @@ class Processor(Iface, TProcessor):
     result = hasNext_result()
     try:
       result.success = self._handler.hasNext(args.scanner)
-    except UnknownScanner as ouch1:
+    except UnknownScanner, ouch1:
       result.ouch1 = ouch1
     oprot.writeMessageBegin("hasNext", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4741,11 +4741,11 @@ class Processor(Iface, TProcessor):
     result = nextEntry_result()
     try:
       result.success = self._handler.nextEntry(args.scanner)
-    except NoMoreEntriesException as ouch1:
+    except NoMoreEntriesException, ouch1:
       result.ouch1 = ouch1
-    except UnknownScanner as ouch2:
+    except UnknownScanner, ouch2:
       result.ouch2 = ouch2
-    except AccumuloSecurityException as ouch3:
+    except AccumuloSecurityException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("nextEntry", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4759,11 +4759,11 @@ class Processor(Iface, TProcessor):
     result = nextK_result()
     try:
       result.success = self._handler.nextK(args.scanner, args.k)
-    except NoMoreEntriesException as ouch1:
+    except NoMoreEntriesException, ouch1:
       result.ouch1 = ouch1
-    except UnknownScanner as ouch2:
+    except UnknownScanner, ouch2:
       result.ouch2 = ouch2
-    except AccumuloSecurityException as ouch3:
+    except AccumuloSecurityException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("nextK", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4777,7 +4777,7 @@ class Processor(Iface, TProcessor):
     result = closeScanner_result()
     try:
       self._handler.closeScanner(args.scanner)
-    except UnknownScanner as ouch1:
+    except UnknownScanner, ouch1:
       result.ouch1 = ouch1
     oprot.writeMessageBegin("closeScanner", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4791,13 +4791,13 @@ class Processor(Iface, TProcessor):
     result = updateAndFlush_result()
     try:
       self._handler.updateAndFlush(args.login, args.tableName, args.cells)
-    except AccumuloException as outch1:
+    except AccumuloException, outch1:
       result.outch1 = outch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
-    except MutationsRejectedException as ouch4:
+    except MutationsRejectedException, ouch4:
       result.ouch4 = ouch4
     oprot.writeMessageBegin("updateAndFlush", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4811,11 +4811,11 @@ class Processor(Iface, TProcessor):
     result = createWriter_result()
     try:
       result.success = self._handler.createWriter(args.login, args.tableName, args.opts)
-    except AccumuloException as outch1:
+    except AccumuloException, outch1:
       result.outch1 = outch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("createWriter", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4836,9 +4836,9 @@ class Processor(Iface, TProcessor):
     result = flush_result()
     try:
       self._handler.flush(args.writer)
-    except UnknownWriter as ouch1:
+    except UnknownWriter, ouch1:
       result.ouch1 = ouch1
-    except MutationsRejectedException as ouch2:
+    except MutationsRejectedException, ouch2:
       result.ouch2 = ouch2
     oprot.writeMessageBegin("flush", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4852,9 +4852,9 @@ class Processor(Iface, TProcessor):
     result = closeWriter_result()
     try:
       self._handler.closeWriter(args.writer)
-    except UnknownWriter as ouch1:
+    except UnknownWriter, ouch1:
       result.ouch1 = ouch1
-    except MutationsRejectedException as ouch2:
+    except MutationsRejectedException, ouch2:
       result.ouch2 = ouch2
     oprot.writeMessageBegin("closeWriter", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4868,11 +4868,11 @@ class Processor(Iface, TProcessor):
     result = updateRowConditionally_result()
     try:
       result.success = self._handler.updateRowConditionally(args.login, args.tableName, args.row, args.updates)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("updateRowConditionally", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4886,11 +4886,11 @@ class Processor(Iface, TProcessor):
     result = createConditionalWriter_result()
     try:
       result.success = self._handler.createConditionalWriter(args.login, args.tableName, args.options)
-    except AccumuloException as ouch1:
+    except AccumuloException, ouch1:
       result.ouch1 = ouch1
-    except AccumuloSecurityException as ouch2:
+    except AccumuloSecurityException, ouch2:
       result.ouch2 = ouch2
-    except TableNotFoundException as ouch3:
+    except TableNotFoundException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("createConditionalWriter", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4904,11 +4904,11 @@ class Processor(Iface, TProcessor):
     result = updateRowsConditionally_result()
     try:
       result.success = self._handler.updateRowsConditionally(args.conditionalWriter, args.updates)
-    except UnknownWriter as ouch1:
+    except UnknownWriter, ouch1:
       result.ouch1 = ouch1
-    except AccumuloException as ouch2:
+    except AccumuloException, ouch2:
       result.ouch2 = ouch2
-    except AccumuloSecurityException as ouch3:
+    except AccumuloSecurityException, ouch3:
       result.ouch3 = ouch3
     oprot.writeMessageBegin("updateRowsConditionally", TMessageType.REPLY, seqid)
     result.write(oprot)
@@ -4985,7 +4985,7 @@ class login_args:
       elif fid == 2:
         if ftype == TType.MAP:
           self.loginProperties = {}
-          (_ktype136, _vtype137, _size135 ) = iprot.readMapBegin() 
+          (_ktype136, _vtype137, _size135 ) = iprot.readMapBegin()
           for _i139 in xrange(_size135):
             _key140 = iprot.readString();
             _val141 = iprot.readString();
@@ -6044,7 +6044,7 @@ class cloneTable_args:
       elif fid == 5:
         if ftype == TType.MAP:
           self.propertiesToSet = {}
-          (_ktype166, _vtype167, _size165 ) = iprot.readMapBegin() 
+          (_ktype166, _vtype167, _size165 ) = iprot.readMapBegin()
           for _i169 in xrange(_size165):
             _key170 = iprot.readString();
             _val171 = iprot.readString();
@@ -7792,7 +7792,7 @@ class getLocalityGroups_result:
       if fid == 0:
         if ftype == TType.MAP:
           self.success = {}
-          (_ktype203, _vtype204, _size202 ) = iprot.readMapBegin() 
+          (_ktype203, _vtype204, _size202 ) = iprot.readMapBegin()
           for _i206 in xrange(_size202):
             _key207 = iprot.readString();
             _val208 = set()
@@ -8413,7 +8413,7 @@ class getTableProperties_result:
       if fid == 0:
         if ftype == TType.MAP:
           self.success = {}
-          (_ktype226, _vtype227, _size225 ) = iprot.readMapBegin() 
+          (_ktype226, _vtype227, _size225 ) = iprot.readMapBegin()
           for _i229 in xrange(_size225):
             _key230 = iprot.readString();
             _val231 = iprot.readString();
@@ -9276,7 +9276,7 @@ class listIterators_result:
       if fid == 0:
         if ftype == TType.MAP:
           self.success = {}
-          (_ktype249, _vtype250, _size248 ) = iprot.readMapBegin() 
+          (_ktype249, _vtype250, _size248 ) = iprot.readMapBegin()
           for _i252 in xrange(_size248):
             _key253 = iprot.readString();
             _val254 = set()
@@ -9464,7 +9464,7 @@ class listConstraints_result:
       if fid == 0:
         if ftype == TType.MAP:
           self.success = {}
-          (_ktype265, _vtype266, _size264 ) = iprot.readMapBegin() 
+          (_ktype265, _vtype266, _size264 ) = iprot.readMapBegin()
           for _i268 in xrange(_size264):
             _key269 = iprot.readString();
             _val270 = iprot.readI32();
@@ -10822,7 +10822,7 @@ class setLocalityGroups_args:
       elif fid == 3:
         if ftype == TType.MAP:
           self.groups = {}
-          (_ktype281, _vtype282, _size280 ) = iprot.readMapBegin() 
+          (_ktype281, _vtype282, _size280 ) = iprot.readMapBegin()
           for _i284 in xrange(_size280):
             _key285 = iprot.readString();
             _val286 = set()
@@ -11572,7 +11572,7 @@ class tableIdMap_result:
       if fid == 0:
         if ftype == TType.MAP:
           self.success = {}
-          (_ktype304, _vtype305, _size303 ) = iprot.readMapBegin() 
+          (_ktype304, _vtype305, _size303 ) = iprot.readMapBegin()
           for _i307 in xrange(_size303):
             _key308 = iprot.readString();
             _val309 = iprot.readString();
@@ -12379,7 +12379,7 @@ class getSiteConfiguration_result:
       if fid == 0:
         if ftype == TType.MAP:
           self.success = {}
-          (_ktype327, _vtype328, _size326 ) = iprot.readMapBegin() 
+          (_ktype327, _vtype328, _size326 ) = iprot.readMapBegin()
           for _i330 in xrange(_size326):
             _key331 = iprot.readString();
             _val332 = iprot.readString();
@@ -12534,7 +12534,7 @@ class getSystemConfiguration_result:
       if fid == 0:
         if ftype == TType.MAP:
           self.success = {}
-          (_ktype336, _vtype337, _size335 ) = iprot.readMapBegin() 
+          (_ktype336, _vtype337, _size335 ) = iprot.readMapBegin()
           for _i339 in xrange(_size335):
             _key340 = iprot.readString();
             _val341 = iprot.readString();
@@ -13240,7 +13240,7 @@ class authenticateUser_args:
       elif fid == 3:
         if ftype == TType.MAP:
           self.properties = {}
-          (_ktype352, _vtype353, _size351 ) = iprot.readMapBegin() 
+          (_ktype352, _vtype353, _size351 ) = iprot.readMapBegin()
           for _i355 in xrange(_size351):
             _key356 = iprot.readString();
             _val357 = iprot.readString();
@@ -16372,7 +16372,7 @@ class updateAndFlush_args:
       elif fid == 3:
         if ftype == TType.MAP:
           self.cells = {}
-          (_ktype382, _vtype383, _size381 ) = iprot.readMapBegin() 
+          (_ktype382, _vtype383, _size381 ) = iprot.readMapBegin()
           for _i385 in xrange(_size381):
             _key386 = iprot.readString();
             _val387 = []
@@ -16750,7 +16750,7 @@ class update_args:
       elif fid == 2:
         if ftype == TType.MAP:
           self.cells = {}
-          (_ktype398, _vtype399, _size397 ) = iprot.readMapBegin() 
+          (_ktype398, _vtype399, _size397 ) = iprot.readMapBegin()
           for _i401 in xrange(_size397):
             _key402 = iprot.readString();
             _val403 = []
@@ -17487,7 +17487,7 @@ class updateRowsConditionally_args:
       elif fid == 2:
         if ftype == TType.MAP:
           self.updates = {}
-          (_ktype414, _vtype415, _size413 ) = iprot.readMapBegin() 
+          (_ktype414, _vtype415, _size413 ) = iprot.readMapBegin()
           for _i417 in xrange(_size413):
             _key418 = iprot.readString();
             _val419 = ConditionalUpdates()
@@ -17570,7 +17570,7 @@ class updateRowsConditionally_result:
       if fid == 0:
         if ftype == TType.MAP:
           self.success = {}
-          (_ktype423, _vtype424, _size422 ) = iprot.readMapBegin() 
+          (_ktype423, _vtype424, _size422 ) = iprot.readMapBegin()
           for _i426 in xrange(_size422):
             _key427 = iprot.readString();
             _val428 = iprot.readI32();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/proxy/src/main/python/constants.py
----------------------------------------------------------------------
diff --git a/proxy/src/main/python/constants.py b/proxy/src/main/python/constants.py
index e61382e..aea4826 100644
--- a/proxy/src/main/python/constants.py
+++ b/proxy/src/main/python/constants.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Autogenerated by Thrift Compiler (0.9.0)
+# Autogenerated by Thrift Compiler (0.9.1)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #

http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/proxy/src/main/python/ttypes.py
----------------------------------------------------------------------
diff --git a/proxy/src/main/python/ttypes.py b/proxy/src/main/python/ttypes.py
index 2ec3346..6a1b423 100644
--- a/proxy/src/main/python/ttypes.py
+++ b/proxy/src/main/python/ttypes.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Autogenerated by Thrift Compiler (0.9.0)
+# Autogenerated by Thrift Compiler (0.9.1)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -925,7 +925,7 @@ class IteratorSetting:
       elif fid == 4:
         if ftype == TType.MAP:
           self.properties = {}
-          (_ktype15, _vtype16, _size14 ) = iprot.readMapBegin() 
+          (_ktype15, _vtype16, _size14 ) = iprot.readMapBegin()
           for _i18 in xrange(_size14):
             _key19 = iprot.readString();
             _val20 = iprot.readString();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/proxy/src/main/ruby/accumulo_proxy.rb
----------------------------------------------------------------------
diff --git a/proxy/src/main/ruby/accumulo_proxy.rb b/proxy/src/main/ruby/accumulo_proxy.rb
index 4c8f484..16f7042 100644
--- a/proxy/src/main/ruby/accumulo_proxy.rb
+++ b/proxy/src/main/ruby/accumulo_proxy.rb
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Autogenerated by Thrift Compiler (0.9.0)
+# Autogenerated by Thrift Compiler (0.9.1)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #

http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/proxy/src/main/ruby/proxy_constants.rb
----------------------------------------------------------------------
diff --git a/proxy/src/main/ruby/proxy_constants.rb b/proxy/src/main/ruby/proxy_constants.rb
index 2d676a6..98a589e 100644
--- a/proxy/src/main/ruby/proxy_constants.rb
+++ b/proxy/src/main/ruby/proxy_constants.rb
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Autogenerated by Thrift Compiler (0.9.0)
+# Autogenerated by Thrift Compiler (0.9.1)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #

http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/proxy/src/main/ruby/proxy_types.rb
----------------------------------------------------------------------
diff --git a/proxy/src/main/ruby/proxy_types.rb b/proxy/src/main/ruby/proxy_types.rb
index 8b9cbf0..722e248 100644
--- a/proxy/src/main/ruby/proxy_types.rb
+++ b/proxy/src/main/ruby/proxy_types.rb
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Autogenerated by Thrift Compiler (0.9.0)
+# Autogenerated by Thrift Compiler (0.9.1)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #

http://git-wip-us.apache.org/repos/asf/accumulo/blob/520f5fde/trace/src/main/java/org/apache/accumulo/trace/thrift/RemoteSpan.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/thrift/RemoteSpan.java b/trace/src/main/java/org/apache/accumulo/trace/thrift/RemoteSpan.java
index 5ac08b7..416ae17 100644
--- a/trace/src/main/java/org/apache/accumulo/trace/thrift/RemoteSpan.java
+++ b/trace/src/main/java/org/apache/accumulo/trace/thrift/RemoteSpan.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -31,6 +31,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -46,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings("all") public class RemoteSpan implements org.apache.thrift.TBase<RemoteSpan, RemoteSpan._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings("all") public class RemoteSpan implements org.apache.thrift.TBase<RemoteSpan, RemoteSpan._Fields>, java.io.Serializable, Cloneable, Comparable<RemoteSpan> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RemoteSpan");
 
   private static final org.apache.thrift.protocol.TField SENDER_FIELD_DESC = new org.apache.thrift.protocol.TField("sender", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -242,18 +244,7 @@ import org.slf4j.LoggerFactory;
       this.description = other.description;
     }
     if (other.isSetData()) {
-      Map<String,String> __this__data = new HashMap<String,String>();
-      for (Map.Entry<String, String> other_element : other.data.entrySet()) {
-
-        String other_element_key = other_element.getKey();
-        String other_element_value = other_element.getValue();
-
-        String __this__data_copy_key = other_element_key;
-
-        String __this__data_copy_value = other_element_value;
-
-        __this__data.put(__this__data_copy_key, __this__data_copy_value);
-      }
+      Map<String,String> __this__data = new HashMap<String,String>(other.data);
       this.data = __this__data;
     }
   }
@@ -743,100 +734,100 @@ import org.slf4j.LoggerFactory;
     return 0;
   }
 
+  @Override
   public int compareTo(RemoteSpan other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    RemoteSpan typedOther = (RemoteSpan)other;
 
-    lastComparison = Boolean.valueOf(isSetSender()).compareTo(typedOther.isSetSender());
+    lastComparison = Boolean.valueOf(isSetSender()).compareTo(other.isSetSender());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetSender()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sender, typedOther.sender);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sender, other.sender);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSvc()).compareTo(typedOther.isSetSvc());
+    lastComparison = Boolean.valueOf(isSetSvc()).compareTo(other.isSetSvc());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetSvc()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.svc, typedOther.svc);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.svc, other.svc);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetTraceId()).compareTo(typedOther.isSetTraceId());
+    lastComparison = Boolean.valueOf(isSetTraceId()).compareTo(other.isSetTraceId());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetTraceId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.traceId, typedOther.traceId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.traceId, other.traceId);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSpanId()).compareTo(typedOther.isSetSpanId());
+    lastComparison = Boolean.valueOf(isSetSpanId()).compareTo(other.isSetSpanId());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetSpanId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.spanId, typedOther.spanId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.spanId, other.spanId);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetParentId()).compareTo(typedOther.isSetParentId());
+    lastComparison = Boolean.valueOf(isSetParentId()).compareTo(other.isSetParentId());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetParentId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.parentId, typedOther.parentId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.parentId, other.parentId);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStart()).compareTo(typedOther.isSetStart());
+    lastComparison = Boolean.valueOf(isSetStart()).compareTo(other.isSetStart());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStart()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.start, typedOther.start);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.start, other.start);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStop()).compareTo(typedOther.isSetStop());
+    lastComparison = Boolean.valueOf(isSetStop()).compareTo(other.isSetStop());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStop()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stop, typedOther.stop);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stop, other.stop);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDescription()).compareTo(typedOther.isSetDescription());
+    lastComparison = Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetDescription()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.description, typedOther.description);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.description, other.description);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetData()).compareTo(typedOther.isSetData());
+    lastComparison = Boolean.valueOf(isSetData()).compareTo(other.isSetData());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetData()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.data, typedOther.data);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.data, other.data);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1028,8 +1019,8 @@ import org.slf4j.LoggerFactory;
                 struct.data = new HashMap<String,String>(2*_map0.size);
                 for (int _i1 = 0; _i1 < _map0.size; ++_i1)
                 {
-                  String _key2; // required
-                  String _val3; // required
+                  String _key2;
+                  String _val3;
                   _key2 = iprot.readString();
                   _val3 = iprot.readString();
                   struct.data.put(_key2, _val3);
@@ -1223,8 +1214,8 @@ import org.slf4j.LoggerFactory;
           struct.data = new HashMap<String,String>(2*_map6.size);
           for (int _i7 = 0; _i7 < _map6.size; ++_i7)
           {
-            String _key8; // required
-            String _val9; // required
+            String _key8;
+            String _val9;
             _key8 = iprot.readString();
             _val9 = iprot.readString();
             struct.data.put(_key8, _val9);


Mime
View raw message