gchqgh-14 - Started restructing python-shell

c015dariu · Nov 11, 2016 · ad236e3 · ad236e3
1 parent db5bb4d
commit ad236e3
Show file tree

Hide file tree

Showing 8 changed files with 121 additions and 100 deletions.
diff --git a/python-shell/src/main/python/example.py → python-shell/example/example.py b/python-shell/src/main/python/example.py → python-shell/example/example.py
@@ -15,7 +15,7 @@
 #
 
 import gaffer as g
-import gafferConnector
+from gaffer import gaffer_connector
 
 
 def run(host, verbose=False):
@@ -40,7 +40,7 @@ def run_with_connector(gc):
 
 
 def create_connector(host, verbose=False):
-    return gafferConnector.GafferConnector(host, verbose)
+    return gaffer_connector.GafferConnector(host, verbose)
 
 
 def add_elements(gc):

diff --git a/python-shell/src/main/python/examplePki.py → python-shell/example/example_pki.py b/python-shell/src/main/python/examplePki.py → python-shell/example/example_pki.py
@@ -14,19 +14,19 @@
 # limitations under the License.
 #
 
-import gafferConnectorPki
+from gaffer import gaffer_connector_pki
 import example
 
 
 def run(host, verbose=False, pki_cert='cert.pem'):
     # Store your PKI certificate in file cert.pem
-    pki = gafferConnectorPki.PkiCredentials(pki_cert)
+    pki = gaffer_connector_pki.PkiCredentials(pki_cert)
 
     example.run_with_connector(create_connector(host, pki, verbose))
 
 
 def create_connector(host, pki, verbose=False):
-    return gafferConnectorPki.GafferConnector(host, pki, verbose)
+    return gaffer_connector_pki.GafferConnector(host, pki, verbose)
 
 
 if __name__ == "__main__":

diff --git a/python-shell/src/main/python/__init__.py → python-shell/gaffer/__init__.py b/python-shell/src/main/python/__init__.py → python-shell/gaffer/__init__.py