From c7b21abecac28bc4456af6d3bde4ebb64a1233cb Mon Sep 17 00:00:00 2001
From: Evgeniy L <eli@mirantis.com>
Date: Thu, 14 May 2015 10:53:43 +0200
Subject: [PATCH] Fix imports for s/x/solar.core/

---
 example.py                            |  6 +++---
 solar/solar/core/handlers/__init__.py |  8 ++++----
 solar/solar/core/handlers/ansible.py  |  4 ++--
 solar/solar/core/handlers/shell.py    |  4 ++--
 solar/solar/core/observer.py          |  2 +-
 solar/solar/core/resource.py          | 12 ++++++------
 solar/solar/core/signals.py           |  2 +-
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/example.py b/example.py
index 2b499497..3ac24939 100644
--- a/example.py
+++ b/example.py
@@ -1,8 +1,8 @@
 import shutil
 import os
 
-from x import resource
-from x import signals
+from solar.core import resource
+from solar.core import signals
 
 
 signals.Connections.clear()
@@ -71,7 +71,7 @@ signals.connect(haproxy_config, haproxy_service, {'listen_ports':'ports', 'confi
 
 
 #run
-from x  import actions
+from solar.core import actions
 
 actions.resource_action(mariadb_service1, 'run')
 actions.resource_action(keystone_db, 'run')
diff --git a/solar/solar/core/handlers/__init__.py b/solar/solar/core/handlers/__init__.py
index 1fc4e43d..9a683720 100644
--- a/solar/solar/core/handlers/__init__.py
+++ b/solar/solar/core/handlers/__init__.py
@@ -1,7 +1,7 @@
-# -*- coding: UTF-8 -*-
-from x.handlers.ansible import Ansible
-from x.handlers.base import Empty
-from x.handlers.shell import Shell
+# -*- coding: utf-8 -*-
+from solar.core.handlers.ansible import Ansible
+from solar.core.handlers.base import Empty
+from solar.core.handlers.shell import Shell
 
 
 HANDLERS = {'ansible': Ansible,
diff --git a/solar/solar/core/handlers/ansible.py b/solar/solar/core/handlers/ansible.py
index 2a5a1b8e..c3584e1f 100644
--- a/solar/solar/core/handlers/ansible.py
+++ b/solar/solar/core/handlers/ansible.py
@@ -1,9 +1,9 @@
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 import os
 import subprocess
 import yaml
 
-from x.handlers.base import BaseHandler
+from solar.core.handlers.base import BaseHandler
 
 
 class Ansible(BaseHandler):
diff --git a/solar/solar/core/handlers/shell.py b/solar/solar/core/handlers/shell.py
index 66690d35..e89de0ad 100644
--- a/solar/solar/core/handlers/shell.py
+++ b/solar/solar/core/handlers/shell.py
@@ -1,7 +1,7 @@
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 import subprocess
 
-from x.handlers.base import BaseHandler
+from solar.core.handlers.base import BaseHandler
 
 
 class Shell(BaseHandler):
diff --git a/solar/solar/core/observer.py b/solar/solar/core/observer.py
index 7f0d7f0f..d2d37d1f 100644
--- a/solar/solar/core/observer.py
+++ b/solar/solar/core/observer.py
@@ -1,4 +1,4 @@
-from x import signals
+from solar.core import signals
 
 
 class BaseObserver(object):
diff --git a/solar/solar/core/resource.py b/solar/solar/core/resource.py
index 437b5f32..93977bd5 100644
--- a/solar/solar/core/resource.py
+++ b/solar/solar/core/resource.py
@@ -1,4 +1,4 @@
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 import copy
 import json
 import os
@@ -6,11 +6,11 @@ import shutil
 
 import yaml
 
-from x import actions
-from x import db
-from x import observer
-from x import signals
-from x import utils
+from solar.core import actions
+from solar.core import db
+from solar.core import observer
+from solar.core import signals
+from solar.core import utils
 
 
 class Resource(object):
diff --git a/solar/solar/core/signals.py b/solar/solar/core/signals.py
index c56a71db..05ca425a 100644
--- a/solar/solar/core/signals.py
+++ b/solar/solar/core/signals.py
@@ -6,7 +6,7 @@ import os
 
 import db
 
-from x import utils
+from solar.core import utils
 
 
 CLIENTS_CONFIG_KEY = 'clients-data-file'