schemas.zgrab2 -> zgrab2_schemas

setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 here = os.path.abspath(os.path.dirname(__file__))
 
 setup(
-  name="zgrab2-schemas",
+  name="zgrab2_schemas",
   version="0.0.1",
   description="ZSchema definitions for zgrab2's JSON output.",
   classifiers=[
@@ -15,11 +15,7 @@ setup(
   author_email="team@zmap.io",
   url="https://github.com/zmap/zgrab2",
   keywords="zmap censys zgrab2 internet-wide scanning",
-  # packages=["schemas/zgrab2"],
   packages=find_packages(),
   include_package_data=True,
-  zip_safe=False,
+  zip_safe=False
-  install_requires = [
-    "zschema"
-  ],
 )

zgrab2_schemas/zgrab2/bacnet.py

@@ -4,7 +4,7 @@ from zschema.leaves import *
 from zschema.compounds import *
 import zschema.registry
 
-import schemas.zcrypto
+import zcrypto_schemas
 import zgrab2
 
 bacnet_scan_response = SubRecord({

zgrab2_schemas/zgrab2/dnp3.py

@@ -4,7 +4,7 @@ from zschema.leaves import *
 from zschema.compounds import *
 import zschema.registry
 
-import schemas.zcrypto
+import zcrypto_schemas.zcrypto as zcrypto
 import zgrab2
 
 dnp3_scan_response = SubRecord({

zgrab2_schemas/zgrab2/fox.py

@@ -4,7 +4,7 @@ from zschema.leaves import *
 from zschema.compounds import *
 import zschema.registry
 
-import schemas.zcrypto
+import zcrypto_schemas.zcrypto as zcrypto
 import zgrab2
 
 fox_scan_response = SubRecord({

zgrab2_schemas/zgrab2/ftp.py

@@ -4,7 +4,7 @@ from zschema.leaves import *
 from zschema.compounds import *
 import zschema.registry
 
-import schemas.zcrypto
+import zcrypto_schemas.zcrypto as zcrypto
 import zgrab2
 
 # modules/ftp.go - FTPScanResults

zgrab2_schemas/zgrab2/http.py

@@ -4,7 +4,7 @@ from zschema.leaves import *
 from zschema.compounds import *
 import zschema.registry
 
-import schemas.zcrypto
+import zcrypto_schemas.zcrypto as zcrypto
 import zgrab2
 
 # lib/http/header.go: knownHeaders

zgrab2_schemas/zgrab2/imap.py

@@ -4,7 +4,7 @@ from zschema.leaves import *
 from zschema.compounds import *
 import zschema.registry
 
-import schemas.zcrypto
+import zcrypto_schemas.zcrypto as zcrypto
 import zgrab2
 
 imap_scan_response = SubRecord({

zgrab2_schemas/zgrab2/modbus.py

@@ -4,7 +4,7 @@ from zschema.leaves import *
 from zschema.compounds import *
 import zschema.registry
 
-import schemas.zcrypto
+import zcrypto_schemas.zcrypto as zcrypto
 import zgrab2
 
 mei_object_names = [

zgrab2_schemas/zgrab2/mssql.py

@@ -4,7 +4,7 @@ from zschema.leaves import *
 from zschema.compounds import *
 import zschema.registry
 
-import schemas.zcrypto
+import zcrypto_schemas.zcrypto as zcrypto
 import zgrab2
 
 ENCRYPT_MODES = [

zgrab2_schemas/zgrab2/mysql.py

@@ -4,7 +4,7 @@ from zschema.leaves import *
 from zschema.compounds import *
 import zschema.registry
 
-import schemas.zcrypto
+import zcrypto_schemas.zcrypto as zcrypto
 import zgrab2
 
 from zgrab2 import DebugOnly

zgrab2_schemas/zgrab2/ntp.py

@@ -4,7 +4,7 @@ from zschema.leaves import *
 from zschema.compounds import *
 import zschema.registry
 
-import schemas.zcrypto
+import zcrypto_schemas.zcrypto as zcrypto
 import zgrab2
 
 ntp_short = SubRecord({

zgrab2_schemas/zgrab2/oracle.py

@@ -5,7 +5,7 @@ from zschema.leaves import *
 from zschema.compounds import *
 import zschema.registry
 
-import schemas.zcrypto
+import zcrypto_schemas.zcrypto as zcrypto
 import zgrab2
 
 FlagsSet = zgrab2.FlagsSet

zgrab2_schemas/zgrab2/pop3.py

@@ -4,7 +4,7 @@ from zschema.leaves import *
 from zschema.compounds import *
 import zschema.registry
 
-import schemas.zcrypto
+import zcrypto_schemas.zcrypto as zcrypto
 import zgrab2
 
 pop3_scan_response = SubRecord({

zgrab2_schemas/zgrab2/postgres.py

@@ -4,7 +4,7 @@ from zschema.leaves import *
 from zschema.compounds import *
 import zschema.registry
 
-import schemas.zcrypto
+import zcrypto_schemas.zcrypto as zcrypto
 import zgrab2
 
 # modules/postgres/scanner.go - decodeError() (TODO: Currently an unconstrained

zgrab2_schemas/zgrab2/redis.py

@@ -4,7 +4,7 @@ from zschema.leaves import *
 from zschema.compounds import *
 import zschema.registry
 
-import schemas.zcrypto
+import zcrypto_schemas.zcrypto as zcrypto
 import zgrab2
 
 redis_scan_response = SubRecord({

zgrab2_schemas/zgrab2/siemens.py

@@ -4,7 +4,7 @@ from zschema.leaves import *
 from zschema.compounds import *
 import zschema.registry
 
-import schemas.zcrypto
+import zcrypto_schemas.zcrypto as zcrypto
 import zgrab2
 
 siemens_scan_response = SubRecord({

zgrab2_schemas/zgrab2/smb.py

@@ -4,7 +4,7 @@ from zschema.leaves import *
 from zschema.compounds import *
 import zschema.registry
 
-import schemas.zcrypto
+import zcrypto_schemas.zcrypto as zcrypto
 import zgrab2
 
 header_log = {

zgrab2_schemas/zgrab2/smtp.py

@@ -4,7 +4,7 @@ from zschema.leaves import *
 from zschema.compounds import *
 import zschema.registry
 
-import schemas.zcrypto
+import zcrypto_schemas.zcrypto as zcrypto
 import zgrab2
 
 smtp_scan_response = SubRecord({

zgrab2_schemas/zgrab2/ssh.py

@@ -5,7 +5,7 @@ from zschema.leaves import *
 from zschema.compounds import *
 import zschema.registry
 
-import schemas.zcrypto
+import zcrypto_schemas.zcrypto as zcrypto
 import zgrab2
 
 # NOTE: Despite the fact that we have e.g. "supportedHostKeyAlgos",

zgrab2_schemas/zgrab2/telnet.py

@@ -4,7 +4,7 @@ from zschema.leaves import *
 from zschema.compounds import *
 import zschema.registry
 
-import schemas.zcrypto
+import zcrypto_schemas.zcrypto as zcrypto
 import zgrab2
 
 telnet_option = SubRecord({

zgrab2_schemas/zgrab2/zgrab2.py

@@ -5,7 +5,7 @@ from collections import defaultdict
 
 # Base / shared schema types for zgrab2
 
-import schemas.zcrypto
+import zcrypto_schemas.zcrypto as zcrypto
 
 # Map of protocol-name -> protocl-schema. This is wrapped in a SubRecord
 # Protocols are responsible for calling register_scan_response_type(protocol_name, schema).