diff --git a/doc/ExampleConfiguration.py b/doc/ExampleConfiguration.py index cf5f429fa..5ea8d5300 100644 --- a/doc/ExampleConfiguration.py +++ b/doc/ExampleConfiguration.py @@ -2,7 +2,7 @@ This is an example of a minimal CRAB3 configuration file. """ -from CRABClient.Configuration import Configuration +from WMCore.Configuration import Configuration import os config = Configuration() diff --git a/doc/FullConfiguration.py b/doc/FullConfiguration.py index 874c16f23..12eb855a6 100644 --- a/doc/FullConfiguration.py +++ b/doc/FullConfiguration.py @@ -3,7 +3,7 @@ most of the available configuration options. """ -from CRABClient.Configuration import Configuration +from WMCore.Configuration import Configuration import os config = Configuration() diff --git a/doc/config/ExampleConfiguration.py b/doc/config/ExampleConfiguration.py index 6163e9b12..9098c937d 100644 --- a/doc/config/ExampleConfiguration.py +++ b/doc/config/ExampleConfiguration.py @@ -2,7 +2,7 @@ This is a test example of configuration file for CRAB-3 client """ -from CRABClient.Configuration import Configuration +from WMCore.Configuration import Configuration import os config = Configuration() diff --git a/doc/config/FullConfiguration.py b/doc/config/FullConfiguration.py index 56b9902f3..c1fee9eb3 100644 --- a/doc/config/FullConfiguration.py +++ b/doc/config/FullConfiguration.py @@ -2,7 +2,7 @@ This is a test example of configuration file for CRAB-3 client """ -from CRABClient.Configuration import Configuration +from WMCore.Configuration import Configuration import os config = Configuration() diff --git a/doc/crabclient/userdoc/configuration.rst b/doc/crabclient/userdoc/configuration.rst index a7696e0c1..d9df71eda 100644 --- a/doc/crabclient/userdoc/configuration.rst +++ b/doc/crabclient/userdoc/configuration.rst @@ -128,7 +128,7 @@ If another required CRAB3 parameter is not specified in the CRAB2 config file yo And opening the config file you will see which parameters you need to modify:: - from CRABClient.Configuration import Configuration + from WMCore.Configuration import Configuration config = Configuration() config.section_('General') config.General.requestName = 'crab3taskname' diff --git a/src/python/CRABAPI/Abstractions.py b/src/python/CRABAPI/Abstractions.py index b61f959b1..3acad25eb 100644 --- a/src/python/CRABAPI/Abstractions.py +++ b/src/python/CRABAPI/Abstractions.py @@ -2,7 +2,7 @@ from __future__ import print_function import CRABAPI.TopLevel import CRABClient.Commands.submit -from CRABClient.Configuration import Configuration +from WMCore.Configuration import Configuration class Task(object): """ Task - Wraps methods and attributes for a single analysis task diff --git a/src/python/CRABClient/Commands/SubCommand.py b/src/python/CRABClient/Commands/SubCommand.py index ba7ccf56d..3f5f5765d 100644 --- a/src/python/CRABClient/Commands/SubCommand.py +++ b/src/python/CRABClient/Commands/SubCommand.py @@ -6,7 +6,7 @@ from ast import literal_eval from datetime import timedelta -from CRABClient.Configuration import loadConfigurationFile, Configuration +from WMCore.Configuration import loadConfigurationFile, Configuration from ServerUtilities import SERVICE_INSTANCES diff --git a/src/python/CRABClient/UserUtilities.py b/src/python/CRABClient/UserUtilities.py index 508afafce..a86207aee 100644 --- a/src/python/CRABClient/UserUtilities.py +++ b/src/python/CRABClient/UserUtilities.py @@ -12,7 +12,7 @@ from CRABClient.ClientUtilities import DBSURLS, LOGLEVEL_MUTE, colors from CRABClient.ClientUtilities import execute_command, getUserProxy from CRABClient.ClientExceptions import ClientException, UsernameException -from CRABClient.Configuration import Configuration +from WMCore.Configuration import Configuration def config(): """ diff --git a/src/python/CRABClient/Configuration.py b/src/python/CRABClient/WMCoreConfiguration.py similarity index 99% rename from src/python/CRABClient/Configuration.py rename to src/python/CRABClient/WMCoreConfiguration.py index 981b981d9..70930328a 100644 --- a/src/python/CRABClient/Configuration.py +++ b/src/python/CRABClient/WMCoreConfiguration.py @@ -285,7 +285,7 @@ def pythonise_(self, **options): document = options.get('document', False) comment = options.get('comment', False) - result = "from CRABClient.Configuration import Configuration\n" + result = "from WMCore.Configuration import Configuration\n" result += "config = Configuration()\n" for sectionName in self._internal_sections: result += "config.section_(\'%s\')\n" % sectionName diff --git a/test/data/TestConfig.py b/test/data/TestConfig.py index 1d2dadec3..9ef43cef2 100644 --- a/test/data/TestConfig.py +++ b/test/data/TestConfig.py @@ -2,7 +2,7 @@ This is a test example of configuration file for CRAB-3 client """ -from CRABClient.Configuration import Configuration +from WMCore.Configuration import Configuration import os config = Configuration() diff --git a/test/python/CRABClient_t/Client_t.py b/test/python/CRABClient_t/Client_t.py index 41d1c4536..e45b43da2 100644 --- a/test/python/CRABClient_t/Client_t.py +++ b/test/python/CRABClient_t/Client_t.py @@ -4,7 +4,7 @@ Client_t.py """ -from CRABClient.Configuration import Configuration +from WMCore.Configuration import Configuration import os import unittest import logging diff --git a/test/python/CRABClient_t/Commands_t/Commands_t.py b/test/python/CRABClient_t/Commands_t/Commands_t.py index f7429771a..e16a43d57 100644 --- a/test/python/CRABClient_t/Commands_t/Commands_t.py +++ b/test/python/CRABClient_t/Commands_t/Commands_t.py @@ -1,6 +1,6 @@ import CRABRESTModelMock from FakeRESTServer import FakeRESTServer -from CRABClient.Configuration import Configuration +from WMCore.Configuration import Configuration from CRABClient.Commands.server_info import server_info from CRABClient.Commands.getoutput import getoutput from CRABClient.Commands.publish import publish diff --git a/test/python/CRABClient_t/JobType_t/CMSSWConfig_t.py b/test/python/CRABClient_t/JobType_t/CMSSWConfig_t.py index f613f721c..d64248a38 100644 --- a/test/python/CRABClient_t/JobType_t/CMSSWConfig_t.py +++ b/test/python/CRABClient_t/JobType_t/CMSSWConfig_t.py @@ -12,7 +12,7 @@ from CRABClient.JobType.CMSSWConfig import CMSSWConfig from CRABClient.JobType.ScramEnvironment import ScramEnvironment -from CRABClient.Configuration import Configuration +from WMCore.Configuration import Configuration #### Test WMCore.Configuration diff --git a/test/python/CRABClient_t/JobType_t/UserTarball_t.py b/test/python/CRABClient_t/JobType_t/UserTarball_t.py index d64e2aea5..f333de360 100644 --- a/test/python/CRABClient_t/JobType_t/UserTarball_t.py +++ b/test/python/CRABClient_t/JobType_t/UserTarball_t.py @@ -13,7 +13,7 @@ import unittest from CRABClient.JobType.UserTarball import UserTarball -from CRABClient.Configuration import Configuration +from WMCore.Configuration import Configuration from CRABClient.ClientExceptions import InputFileNotFoundException testWMConfig = Configuration()