refactor: rename module input_data to input

Sieboldianus · May 11, 2020 · 0635767 · 0635767
1 parent 1ddf046
commit 0635767
Show file tree

Hide file tree

Showing 15 changed files with 10 additions and 10 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,6 +1,6 @@
 include README.md
 include VERSION
-include lbsntransform/data_input/*
+include lbsntransform/input/*
 include lbsntransform/config/*
 include lbsntransform/tests/*
 include lbsntransform/tools/*
diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ A full list of possible input args is available in the [documentation](https://l
 
 ## Contributing
 
-Field mapping from and to ProtoBuffers from different Social Media sites is provided in classes [field_mapping_xxx.py](/lbsntransform/data_input/mapping/).
+Field mapping from and to ProtoBuffers from different Social Media sites is provided in classes [field_mapping_xxx.py](/lbsntransform/input/mapping/).
 As an example, mapping of the Twitter json structure is given (see class `FieldMappingTwitter`). This class may be used to extend
 functionality to cover other networks such as Flickr or Foursquare.
 

diff --git a/lbsntransform/__init__.py b/lbsntransform/__init__.py
@@ -6,7 +6,7 @@
 
 from .lbsntransform_ import LBSNTransform
 from .config.config import BaseConfig
-from .data_input.load_data import LoadData
+from .input.load_data import LoadData
 from .output.hll.shared_structure_proto_hlldb import ProtoHLLMapping
 from .output.lbsn.shared_structure_proto_lbsndb import ProtoLBSNMapping
 from .output.shared_structure import (GeocodeLocations, LBSNRecordDicts,

diff --git a/lbsntransform/__main__.py b/lbsntransform/__main__.py
@@ -20,7 +20,7 @@
 
 from lbsntransform.tools.helper_functions import HelperFunctions as HF
 from lbsntransform.output.shared_structure import TimeMonitor
-from lbsntransform.data_input.load_data import LoadData
+from lbsntransform.input.load_data import LoadData
 from lbsntransform.config.config import BaseConfig
 from lbsntransform.lbsntransform_ import LBSNTransform
 

diff --git a/lbsntransform/data_input/__init__.py → lbsntransform/input/__init__.py b/lbsntransform/data_input/__init__.py → lbsntransform/input/__init__.py
diff --git a/lbsntransform/data_input/load_data.py → lbsntransform/input/load_data.py b/lbsntransform/data_input/load_data.py → lbsntransform/input/load_data.py
diff --git a/...transform/data_input/mappings/__init__.py → lbsntransform/input/mappings/__init__.py b/...transform/data_input/mappings/__init__.py → lbsntransform/input/mappings/__init__.py
diff --git a/...transform/data_input/mappings/db_query.py → lbsntransform/input/mappings/db_query.py b/...transform/data_input/mappings/db_query.py → lbsntransform/input/mappings/db_query.py
diff --git a/...m/data_input/mappings/field_mapping_fb.py → ...nsform/input/mappings/field_mapping_fb.py b/...m/data_input/mappings/field_mapping_fb.py → ...nsform/input/mappings/field_mapping_fb.py
diff --git a/...ta_input/mappings/field_mapping_flickr.py → ...rm/input/mappings/field_mapping_flickr.py b/...ta_input/mappings/field_mapping_flickr.py → ...rm/input/mappings/field_mapping_flickr.py
diff --git a/...data_input/mappings/field_mapping_lbsn.py → ...form/input/mappings/field_mapping_lbsn.py b/...data_input/mappings/field_mapping_lbsn.py → ...form/input/mappings/field_mapping_lbsn.py
diff --git a/...a_input/mappings/field_mapping_twitter.py → ...m/input/mappings/field_mapping_twitter.py b/...a_input/mappings/field_mapping_twitter.py → ...m/input/mappings/field_mapping_twitter.py
diff --git a/..._input/mappings/field_mapping_yfcc100m.py → .../input/mappings/field_mapping_yfcc100m.py b/..._input/mappings/field_mapping_yfcc100m.py → .../input/mappings/field_mapping_yfcc100m.py
diff --git a/lbsntransform/lbsntransform_.py b/lbsntransform/lbsntransform_.py
@@ -19,7 +19,7 @@
 from .tools.helper_functions import HelperFunctions as HF
 from .output.shared_structure import LBSNRecordDicts
 from .output.submit_data import LBSNTransfer
-from .data_input.load_data import LoadData
+from .input.load_data import LoadData
 
 
 class LBSNTransform():

diff --git a/lbsntransform/tools/helper_functions.py b/lbsntransform/tools/helper_functions.py
@@ -690,20 +690,20 @@ def load_importer_mapping_module(origin: int):
             1 - Instagram, 2 - Flickr, 3 - Twitter, 4 - Facebook
         """
         if origin == 0:
-            from lbsntransform.data_input.mappings.field_mapping_lbsn import \
+            from lbsntransform.input.mappings.field_mapping_lbsn import \
                 FieldMappingLBSN as importer
         elif origin == 2:
-            from lbsntransform.data_input.mappings.field_mapping_flickr import \
+            from lbsntransform.input.mappings.field_mapping_flickr import \
                 FieldMappingFlickr as importer
         elif origin == 21:
             # Flickr YFCC100M dataset
-            from lbsntransform.data_input.mappings.field_mapping_yfcc100m import \
+            from lbsntransform.input.mappings.field_mapping_yfcc100m import \
                 FieldMappingYFCC100M as importer
         elif origin == 3:
-            from lbsntransform.data_input.mappings.field_mapping_twitter import \
+            from lbsntransform.input.mappings.field_mapping_twitter import \
                 FieldMappingTwitter as importer
         elif origin == 41:
-            from lbsntransform.data_input.mappings.field_mapping_fb import \
+            from lbsntransform.input.mappings.field_mapping_fb import \
                 FieldMappingFBPlace as importer
         else:
             raise ValueError("Input type not supported")