From c3fe53123b2b28c36f3fa60627919916dfc758fa Mon Sep 17 00:00:00 2001
From: Lipu Fei <lipu.fei815@gmail.com>
Date: Thu, 29 Mar 2018 11:01:09 +0200
Subject: [PATCH] Create module cura.ReaderWriters

CURA-4644

Move all reader writer classes into cura.ReaderWriters.
---
 cura/{ => ReaderWriters}/ProfileReader.py          | 0
 cura/{ => ReaderWriters}/ProfileWriter.py          | 0
 cura/ReaderWriters/__init__.py                     | 0
 cura/Settings/CuraContainerRegistry.py             | 3 +--
 plugins/CuraProfileReader/CuraProfileReader.py     | 2 +-
 plugins/CuraProfileWriter/CuraProfileWriter.py     | 3 +--
 plugins/GCodeProfileReader/GCodeProfileReader.py   | 2 +-
 plugins/LegacyProfileReader/LegacyProfileReader.py | 3 +--
 8 files changed, 5 insertions(+), 8 deletions(-)
 rename cura/{ => ReaderWriters}/ProfileReader.py (100%)
 rename cura/{ => ReaderWriters}/ProfileWriter.py (100%)
 create mode 100644 cura/ReaderWriters/__init__.py

diff --git a/cura/ProfileReader.py b/cura/ReaderWriters/ProfileReader.py
similarity index 100%
rename from cura/ProfileReader.py
rename to cura/ReaderWriters/ProfileReader.py
diff --git a/cura/ProfileWriter.py b/cura/ReaderWriters/ProfileWriter.py
similarity index 100%
rename from cura/ProfileWriter.py
rename to cura/ReaderWriters/ProfileWriter.py
diff --git a/cura/ReaderWriters/__init__.py b/cura/ReaderWriters/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cura/Settings/CuraContainerRegistry.py b/cura/Settings/CuraContainerRegistry.py
index 6600512672..8d4f711155 100644
--- a/cura/Settings/CuraContainerRegistry.py
+++ b/cura/Settings/CuraContainerRegistry.py
@@ -25,11 +25,10 @@ from UM.Resources import Resources
 
 from . import ExtruderStack
 from . import GlobalStack
-from .ExtruderManager import ExtruderManager
 
 from cura.CuraApplication import CuraApplication
 from cura.Machines.QualityManager import getMachineDefinitionIDForQualitySearch
-from cura.ProfileReader import NoProfileException
+from cura.ReaderWriters.ProfileReader import NoProfileException
 
 from UM.i18n import i18nCatalog
 catalog = i18nCatalog("cura")
diff --git a/plugins/CuraProfileReader/CuraProfileReader.py b/plugins/CuraProfileReader/CuraProfileReader.py
index 69b2187541..12434d2c3f 100644
--- a/plugins/CuraProfileReader/CuraProfileReader.py
+++ b/plugins/CuraProfileReader/CuraProfileReader.py
@@ -5,7 +5,7 @@ import configparser
 from UM.PluginRegistry import PluginRegistry
 from UM.Logger import Logger
 from UM.Settings.InstanceContainer import InstanceContainer  # The new profile to make.
-from cura.ProfileReader import ProfileReader
+from cura.ReaderWriters.ProfileReader import ProfileReader
 
 import zipfile
 
diff --git a/plugins/CuraProfileWriter/CuraProfileWriter.py b/plugins/CuraProfileWriter/CuraProfileWriter.py
index 864a9b602c..78f0b078d9 100644
--- a/plugins/CuraProfileWriter/CuraProfileWriter.py
+++ b/plugins/CuraProfileWriter/CuraProfileWriter.py
@@ -3,8 +3,7 @@
 # Uranium is released under the terms of the LGPLv3 or higher.
 
 from UM.Logger import Logger
-from UM.SaveFile import SaveFile
-from cura.ProfileWriter import ProfileWriter
+from cura.ReaderWriters.ProfileWriter import ProfileWriter
 import zipfile
 
 ##  Writes profiles to Cura's own profile format with config files.
diff --git a/plugins/GCodeProfileReader/GCodeProfileReader.py b/plugins/GCodeProfileReader/GCodeProfileReader.py
index d6bda85a48..f255950c36 100644
--- a/plugins/GCodeProfileReader/GCodeProfileReader.py
+++ b/plugins/GCodeProfileReader/GCodeProfileReader.py
@@ -9,7 +9,7 @@ from UM.Logger import Logger
 from UM.i18n import i18nCatalog
 catalog = i18nCatalog("cura")
 
-from cura.ProfileReader import ProfileReader, NoProfileException
+from cura.ReaderWriters.ProfileReader import ProfileReader, NoProfileException
 
 ##  A class that reads profile data from g-code files.
 #
diff --git a/plugins/LegacyProfileReader/LegacyProfileReader.py b/plugins/LegacyProfileReader/LegacyProfileReader.py
index 824fc959a1..3c2b9bfa76 100644
--- a/plugins/LegacyProfileReader/LegacyProfileReader.py
+++ b/plugins/LegacyProfileReader/LegacyProfileReader.py
@@ -12,8 +12,7 @@ from UM.Logger import Logger  # Logging errors.
 from UM.PluginRegistry import PluginRegistry  # For getting the path to this plugin's directory.
 from UM.Settings.ContainerRegistry import ContainerRegistry #To create unique profile IDs.
 from UM.Settings.InstanceContainer import InstanceContainer  # The new profile to make.
-from cura.ProfileReader import ProfileReader  # The plug-in type to implement.
-from cura.Settings.ExtruderManager import ExtruderManager #To get the current extruder definition.
+from cura.ReaderWriters.ProfileReader import ProfileReader  # The plug-in type to implement.
 
 
 ##  A plugin that reads profile data from legacy Cura versions.