migrated the proxy types from 'proxy' to 'pyaccumulo.proxy'

Author: jatrost

examples/doc_search.py

@@ -17,9 +17,10 @@
 from pyaccumulo import Accumulo, Mutation, Range
 from pyaccumulo.iterators import *
 
-from proxy.ttypes import IteratorSetting, IteratorScope
+from pyaccumulo.proxy.ttypes import IteratorSetting, IteratorScope
 from util import hashcode
 import hashlib, re
+import settings
 
 conn = Accumulo(host=settings.HOST, port=settings.PORT, user=settings.USER, password=settings.PASSWORD)
 

examples/intersecting_iterator.py

@@ -17,9 +17,10 @@
 from pyaccumulo import Accumulo, Mutation, Range
 from pyaccumulo.iterators import *
 
-from proxy.ttypes import IteratorSetting, IteratorScope
+from pyaccumulo.proxy.ttypes import IteratorSetting, IteratorScope
 from util import hashcode
 import hashlib, re
+import settings
 
 conn = Accumulo(host=settings.HOST, port=settings.PORT, user=settings.USER, password=settings.PASSWORD)
 
@@ -56,4 +57,4 @@
 for doc in conn.batch_scan(table, scanranges=[Range(srow=uuid, erow=uuid) for uuid in uuids]):
     print doc
 
-conn.close()
+conn.close()

examples/regex_search.py

@@ -17,10 +17,11 @@
 from pyaccumulo import Accumulo, Mutation, Range
 from pyaccumulo.iterators import *
 
-from proxy.ttypes import IteratorSetting, IteratorScope
+from pyaccumulo.proxy.ttypes import IteratorSetting, IteratorScope
 from util import hashcode
 import hashlib, re
 
+import settings
 conn = Accumulo(host=settings.HOST, port=settings.PORT, user=settings.USER, password=settings.PASSWORD)
 
 table = "regexes"

examples/simple.py

@@ -15,6 +15,7 @@
 # limitations under the License.
 
 from pyaccumulo import Accumulo, Mutation, Range
+import settings
 
 table = "pythontest"
 

pyaccumulo/__init__.py

@@ -19,9 +19,9 @@
 from thrift.transport import TTransport
 from thrift.protocol import TCompactProtocol
 
-from proxy import AccumuloProxy
-from proxy.ttypes import ScanColumn, ColumnUpdate, ScanOptions, Key, BatchScanOptions, TimeType, WriterOptions, IteratorSetting
-import proxy.ttypes
+from pyaccumulo.proxy import AccumuloProxy
+from pyaccumulo.proxy.ttypes import ScanColumn, ColumnUpdate, ScanOptions, Key, BatchScanOptions, TimeType, WriterOptions, IteratorSetting
+import pyaccumulo.proxy.ttypes
 
 from collections import namedtuple
 from pyaccumulo.iterators import BaseIterator

pyaccumulo/iterators/__init__.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from proxy.ttypes import IteratorSetting, IteratorScope
+from pyaccumulo.proxy.ttypes import IteratorSetting, IteratorScope
 
 class BaseIterator(object):
     """docstring for BaseIterator"""

proxy/AccumuloProxy-remote pyaccumulo/proxy/AccumuloProxy-remote

@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 HOST = "localhost"
 PORT = 50096
 USER = 'root'

proxy/AccumuloProxy.py pyaccumulo/proxy/AccumuloProxy.py

@@ -108,7 +108,9 @@ def run(self):
       url = 'https://github.com/accumulo/pyaccumulo',
       keywords = 'accumulo client db distributed thrift',
       packages = ['pyaccumulo',
-                  'pyaccumulo.iterators'],
+                  'pyaccumulo.iterators',
+                  'pyaccumulo.proxy'
+                  ],
       install_requires = ['thrift'],
       py_modules=['ez_setup'],
       cmdclass={"doc": doc, "rpm": rpm},