Update various module names.

diff --git a/aces_1.0.0/python/aces_ocio/__init__.py b/aces_1.0.0/python/aces_ocio/__init__.py
index a0f169b..6b845ec 100644 (file)
--- a/aces_1.0.0/python/aces_ocio/__init__.py
+++ b/aces_1.0.0/python/aces_ocio/__init__.py
@@ -11,7 +11,7 @@ Usage
 Python
 ******
 
->>> from aces_ocio.aces_config import create_ACES_config
+>>> from aces_ocio.config import create_ACES_config
 >>> aces_ctl_directory = '/path/to/github/checkout/releases/v1.0.0/transforms/ctl'
 >>> config_directory = '/path/to/configuration/dir'
 >>> create_ACES_config(aces_ctl_directory, config_directory, 1024, 33, True)

diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/aces.py b/aces_1.0.0/python/aces_ocio/colorspaces/aces.py
index cd82d13..cf02f5c 100644 (file)
--- a/aces_1.0.0/python/aces_ocio/colorspaces/aces.py
+++ b/aces_1.0.0/python/aces_ocio/colorspaces/aces.py
@@ -16,7 +16,7 @@ import shutil
 
 import PyOpenColorIO as ocio
 
-from aces_ocio.generate_lut import (
+from aces_ocio.lut import (
     generate_1d_LUT_from_CTL,
     generate_3d_LUT_from_CTL,
     write_SPI_1d)

diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/arri.py b/aces_1.0.0/python/aces_ocio/colorspaces/arri.py
index ec75a62..6ef5eae 100644 (file)
--- a/aces_1.0.0/python/aces_ocio/colorspaces/arri.py
+++ b/aces_1.0.0/python/aces_ocio/colorspaces/arri.py
@@ -13,7 +13,7 @@ import os
 
 import PyOpenColorIO as ocio
 
-import aces_ocio.generate_lut as genlut
+import aces_ocio.lut as genlut
 from aces_ocio.utilities import ColorSpace, mat44_from_mat33, sanitize
 
 __author__ = 'ACES Developers'

diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/canon.py b/aces_1.0.0/python/aces_ocio/colorspaces/canon.py
index 64ffb60..505f6c8 100644 (file)
--- a/aces_1.0.0/python/aces_ocio/colorspaces/canon.py
+++ b/aces_1.0.0/python/aces_ocio/colorspaces/canon.py
@@ -12,7 +12,7 @@ import os
 
 import PyOpenColorIO as ocio
 
-import aces_ocio.generate_lut as genlut
+import aces_ocio.lut as genlut
 from aces_ocio.utilities import ColorSpace
 
 __author__ = 'ACES Developers'

diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/general.py b/aces_1.0.0/python/aces_ocio/colorspaces/general.py
index cb935f7..77102a8 100644 (file)
--- a/aces_1.0.0/python/aces_ocio/colorspaces/general.py
+++ b/aces_1.0.0/python/aces_ocio/colorspaces/general.py
@@ -12,7 +12,7 @@ import os
 
 import PyOpenColorIO as ocio
 
-import aces_ocio.generate_lut as genlut
+import aces_ocio.lut as genlut
 from aces_ocio.colorspaces import aces
 from aces_ocio.utilities import ColorSpace, mat44_from_mat33
 

diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/gopro.py b/aces_1.0.0/python/aces_ocio/colorspaces/gopro.py
index 44b5858..2431ac9 100644 (file)
--- a/aces_1.0.0/python/aces_ocio/colorspaces/gopro.py
+++ b/aces_1.0.0/python/aces_ocio/colorspaces/gopro.py
@@ -12,7 +12,7 @@ import os
 
 import PyOpenColorIO as ocio
 
-import aces_ocio.generate_lut as genlut
+import aces_ocio.lut as genlut
 from aces_ocio.utilities import (ColorSpace, sanitize)
 
 __author__ = 'ACES Developers'

diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/panasonic.py b/aces_1.0.0/python/aces_ocio/colorspaces/panasonic.py
index 2d32131..62d7264 100644 (file)
--- a/aces_1.0.0/python/aces_ocio/colorspaces/panasonic.py
+++ b/aces_1.0.0/python/aces_ocio/colorspaces/panasonic.py
@@ -11,7 +11,7 @@ import os
 
 import PyOpenColorIO as ocio
 
-import aces_ocio.generate_lut as genlut
+import aces_ocio.lut as genlut
 from aces_ocio.utilities import ColorSpace
 
 __author__ = 'ACES Developers'

diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/red.py b/aces_1.0.0/python/aces_ocio/colorspaces/red.py
index f93153c..0a8f868 100644 (file)
--- a/aces_1.0.0/python/aces_ocio/colorspaces/red.py
+++ b/aces_1.0.0/python/aces_ocio/colorspaces/red.py
@@ -12,7 +12,7 @@ import os
 
 import PyOpenColorIO as ocio
 
-import aces_ocio.generate_lut as genlut
+import aces_ocio.lut as genlut
 from aces_ocio.utilities import ColorSpace, mat44_from_mat33
 
 __author__ = 'ACES Developers'

diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/sony.py b/aces_1.0.0/python/aces_ocio/colorspaces/sony.py
index a19d2e5..881fd23 100644 (file)
--- a/aces_1.0.0/python/aces_ocio/colorspaces/sony.py
+++ b/aces_1.0.0/python/aces_ocio/colorspaces/sony.py
@@ -12,7 +12,7 @@ import os
 
 import PyOpenColorIO as ocio
 
-import aces_ocio.generate_lut as genlut
+import aces_ocio.lut as genlut
 from aces_ocio.utilities import ColorSpace, mat44_from_mat33
 
 __author__ = 'ACES Developers'

diff --git a/aces_1.0.0/python/aces_ocio/aces_config.py b/aces_1.0.0/python/aces_ocio/config.py
similarity index 100%
rename from aces_1.0.0/python/aces_ocio/aces_config.py
rename to aces_1.0.0/python/aces_ocio/config.py

diff --git a/aces_1.0.0/python/aces_ocio/generate_lut.py b/aces_1.0.0/python/aces_ocio/lut.py
similarity index 100%
rename from aces_1.0.0/python/aces_ocio/generate_lut.py
rename to aces_1.0.0/python/aces_ocio/lut.py

diff --git a/aces_1.0.0/python/aces_ocio/tests/tests_aces_config.py b/aces_1.0.0/python/aces_ocio/tests/tests_aces_config.py
index b5c1181..b9a9b3d 100644 (file)
--- a/aces_1.0.0/python/aces_ocio/tests/tests_aces_config.py
+++ b/aces_1.0.0/python/aces_ocio/tests/tests_aces_config.py
@@ -19,7 +19,7 @@ sys.path.append(os.path.abspath(
     os.path.join(os.path.dirname(__file__), '..', '..')))
 
 from aces_ocio.utilities import files_walker
-from aces_ocio.aces_config import (
+from aces_ocio.config import (
     ACES_OCIO_CTL_DIRECTORY_ENVIRON,
     create_ACES_config)
 

diff --git a/aces_1.0.0/python/bin/create_aces_config b/aces_1.0.0/python/bin/create_aces_config
index 8a1a10a..0500b41 100755 (executable)
--- a/aces_1.0.0/python/bin/create_aces_config
+++ b/aces_1.0.0/python/bin/create_aces_config
@@ -12,7 +12,7 @@ import sys
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 
-from aces_ocio.aces_config import main
+from aces_ocio.config import main
 
 __author__ = 'ACES Developers'
 __copyright__ = 'Copyright (C) 2014 - 2015 - ACES Developers'

diff --git a/aces_1.0.0/python/bin/generate_lut b/aces_1.0.0/python/bin/generate_lut
index 80a8f0a..52391b6 100755 (executable)
--- a/aces_1.0.0/python/bin/generate_lut
+++ b/aces_1.0.0/python/bin/generate_lut
@@ -12,7 +12,7 @@ import sys
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 
-from aces_ocio.generate_lut import main
+from aces_ocio.lut import main
 
 __author__ = 'ACES Developers'
 __copyright__ = 'Copyright (C) 2014 - 2015 - ACES Developers'