Merge branch 'kibattul/fix-import-errors' into 'master'

Fixed conflicting names in same folder

See merge request !6

osdu_api/model/legal.py → osdu_api/model/legal/legal.py

@@ -13,7 +13,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from osdu_api.model.legal_compliance import LegalCompliance
+from osdu_api.model.legal.legal_compliance import LegalCompliance
 
 class Legal:
     """

osdu_api/model/record.py

@@ -14,8 +14,8 @@
 #  limitations under the License.
 
 from osdu_api.model.acl import Acl
-from osdu_api.model.legal import Legal
-from osdu_api.model.legal_compliance import LegalCompliance
+from osdu_api.model.legal.legal import Legal
+from osdu_api.model.legal.legal_compliance import LegalCompliance
 from osdu_api.model.record_ancestry import RecordAncestry
 
 class Record:

osdu_api/model/storage/legal.py

@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# from osdu_api.model.legal_compliance import LegalCompliance
+# from osdu_api.model.legal.legal_compliance import LegalCompliance
 
 class Legal:
     """

osdu_api/model/storage/query_records_request.py

@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# from osdu_api.model.legal_compliance import LegalCompliance
+# from osdu_api.model.legal.legal_compliance import LegalCompliance
 from osdu_api.model.base import Base