Renamed json, yaml and xml files to handle module conflict clash

bots/y-bot/tests/core/datetime_convo.tests

@@ -24,18 +24,24 @@
 
 # WHAT # DAY #
 "WHAT DAY", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"
+"WHAT DAY IS IT TODAY", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"
+"TELL ME WHAT DAY IT IS", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"
 
 # WHICH # DAY #
 "WHICH DAY", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"
+"WHICH DAY IS IT TODAY", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"
+"TELL ME WHICH DAY IT IS", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"
 
 # TODAY
 "TODAY", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"
 
 # WHAT # TODAY
 "WHAT TODAY", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"
+"WHAT DAY IS IT TODAY", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"
 
 # WHAT # DAY # TOMORROW
 "WHAT DAY TOMORROW", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"
+"WHAT DAY IS TOMORROW", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"
 
 # WHAT IS TOMORROW
 "WHAT DAY IS TOMORROW", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"
@@ -45,12 +51,20 @@
 
 # WHAT # YEAR #
 "WHAT YEAR", "20[0-9][0-9]"
+"WHAT IS THE YEAR", "20[0-9][0-9]"
+"TELL ME WHAT YEAR", "20[0-9][0-9]"
 
 # WHICH # YEAR #
 "WHICH YEAR", "20[0-9][0-9]"
+"WHICH IS THE YEAR", "20[0-9][0-9]"
+"TELL ME WHICH YEAR", "20[0-9][0-9]"
 
 # WHAT # TODAYS DATE #
+"WHAT IS TODAYS DATE", ""Today is *. [0-9]{2},[0-9]{4}"
 
 # WHAT # DATE #
+"WHAT IS THE DATE", ""Today is *. [0-9]{2},[0-9]{4}"
 
 # WHAT # TIME #
+"WHAT IS THE TIME", "The time is [0-9]{2}:[0-9]{2} [AM|PM]"
+"WHAT TIME IS IT", "The time is [0-9]{2}:[0-9]{2} [AM|PM]"

src/programy/config/file/factory.py

@@ -14,9 +14,9 @@
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 """
 
-from programy.config.file.xml import XMLConfigurationFile
-from programy.config.file.yaml import YamlConfigurationFile
-from programy.config.file.json import JSONConfigurationFile
+from programy.config.file.xml_file import XMLConfigurationFile
+from programy.config.file.yaml_file import YamlConfigurationFile
+from programy.config.file.json_file import JSONConfigurationFile
 
 
 class ConfigurationFactory(object):

src/programy/config/file/json.py → src/programy/config/file/json_file.py

@@ -15,7 +15,6 @@
 """
 
 import json
-import yaml
 
 import logging
 from programy.config.file.file import BaseConfigurationFile

src/test/config/client/test_client.py

@@ -1,5 +1,5 @@
 import unittest
-from programy.config.file.yaml import YamlConfigurationFile
+from programy.config.file.yaml_file import YamlConfigurationFile
 from programy.config.client.client import ClientConfiguration
 from programy.config.brain import BrainFileConfiguration
 

src/test/config/client/test_facebook.py

@@ -1,6 +1,6 @@
 import unittest
 
-from programy.config.file.yaml import YamlConfigurationFile
+from programy.config.file.yaml_file import YamlConfigurationFile
 from programy.config.client.client import ClientConfiguration
 from programy.config.client.facebook import FacebookConfiguration, FacebookClientConfiguration
 

src/test/config/client/test_rest.py

@@ -1,7 +1,7 @@
 import unittest
 
 from programy.config.client.rest import RestConfiguration
-from programy.config.file.yaml import YamlConfigurationFile
+from programy.config.file.yaml_file import YamlConfigurationFile
 from programy.config.client.client import ClientConfiguration
 from programy.config.client.rest import RestClientConfiguration
 

src/test/config/client/test_twitter.py

@@ -1,6 +1,6 @@
 import unittest
 
-from programy.config.file.yaml import YamlConfigurationFile
+from programy.config.file.yaml_file import YamlConfigurationFile
 from programy.config.client.client import ClientConfiguration
 from programy.config.client.twitter import TwitterConfiguration, TwitterClientConfiguration
 

src/test/config/client/test_webchat.py

@@ -1,7 +1,7 @@
 import unittest
 
 from programy.config.client.webchat import WebChatConfiguration
-from programy.config.file.yaml import YamlConfigurationFile
+from programy.config.file.yaml_file import YamlConfigurationFile
 from programy.config.client.client import ClientConfiguration
 from programy.config.client.webchat import WebChatClientConfiguration
 

src/test/config/client/test_xmpp.py

@@ -1,6 +1,6 @@
 import unittest
 
-from programy.config.file.yaml import YamlConfigurationFile
+from programy.config.file.yaml_file import YamlConfigurationFile
 from programy.config.client.client import ClientConfiguration
 from programy.config.client.xmpp import XmppConfiguration, XmppClientConfiguration
 

src/test/config/file/test_json.py

@@ -1,7 +1,7 @@
 import unittest
 import os
 
-from programy.config.file.json import JSONConfigurationFile
+from programy.config.file.json_file import JSONConfigurationFile
 from programy.config.client.client import ClientConfiguration
 
 

src/test/config/file/test_xml.py

@@ -1,7 +1,7 @@
 import unittest
 import os
 
-from programy.config.file.xml import XMLConfigurationFile
+from programy.config.file.xml_file import XMLConfigurationFile
 from programy.config.client.client import ClientConfiguration
 
 

src/test/config/file/test_yaml.py

@@ -1,7 +1,7 @@
 import unittest
 import os
 
-from programy.config.file.yaml import YamlConfigurationFile
+from programy.config.file.yaml_file import YamlConfigurationFile
 from programy.config.client.client import ClientConfiguration
 
 class YamlConfigurationFileTests(unittest.TestCase):

src/test/config/test_bot.py

@@ -1,7 +1,7 @@
 import unittest
 
 from programy.config.bot import BotConfiguration
-from programy.config.file.yaml import YamlConfigurationFile
+from programy.config.file.yaml_file import YamlConfigurationFile
 from programy.config.client.client import ClientConfiguration
 
 

src/test/config/test_brain.py

@@ -3,7 +3,7 @@
 from programy.config.brain import BrainFileConfiguration
 from programy.config.brain import BrainServiceConfiguration
 from programy.config.brain import BrainConfiguration
-from programy.config.file.yaml import YamlConfigurationFile
+from programy.config.file.yaml_file import YamlConfigurationFile
 from programy.config.client.client import ClientConfiguration