From c81774a3aa21563c99a0404c62927445d9c0bc6a Mon Sep 17 00:00:00 2001
From: blitzmann <ryan.xgamer99@gmail.com>
Date: Sat, 24 Oct 2015 22:28:31 -0400
Subject: [PATCH] Move pycrest to service (might move it to utils later, dunno)

---
 eos/saveddata/crest.py                       | 10 ++++------
 service/crest.py                             | 11 ++++++-----
 {pycrest => service/pycrest}/__init__.py     |  0
 {pycrest => service/pycrest}/compat.py       |  0
 {pycrest => service/pycrest}/errors.py       |  0
 {pycrest => service/pycrest}/eve.py          | 12 +++++++-----
 {pycrest => service/pycrest}/weak_ciphers.py |  0
 7 files changed, 17 insertions(+), 16 deletions(-)
 rename {pycrest => service/pycrest}/__init__.py (100%)
 rename {pycrest => service/pycrest}/compat.py (100%)
 rename {pycrest => service/pycrest}/errors.py (100%)
 rename {pycrest => service/pycrest}/eve.py (98%)
 rename {pycrest => service/pycrest}/weak_ciphers.py (100%)

diff --git a/eos/saveddata/crest.py b/eos/saveddata/crest.py
index bb43d7664..ccb00b1f4 100644
--- a/eos/saveddata/crest.py
+++ b/eos/saveddata/crest.py
@@ -17,15 +17,13 @@
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
 #===============================================================================
 
-from sqlalchemy.orm import reconstructor
-import pycrest
-import config
-from pycrest import EVE
-from tomorrow import threads
-
 import urllib
 from cStringIO import StringIO
 
+from sqlalchemy.orm import reconstructor
+from tomorrow import threads
+
+
 class Crest(object):
 
     def __init__(self, id, name, refresh_token=None):
diff --git a/service/crest.py b/service/crest.py
index 8863433a4..a679eadf2 100644
--- a/service/crest.py
+++ b/service/crest.py
@@ -1,15 +1,16 @@
+import copy
+import uuid
+
+from wx.lib.pubsub import pub
+
 import eos.db
 from eos.types import Crest as CrestUser
-import pycrest
-import copy
+from service import pycrest
 import service
 from service.server import *
-import uuid
 import config
 from gui.utils.repeatedTimer import RepeatedTimer
 
-from wx.lib.pubsub import setupkwargs
-from wx.lib.pubsub import pub
 
 class Crest():
 
diff --git a/pycrest/__init__.py b/service/pycrest/__init__.py
similarity index 100%
rename from pycrest/__init__.py
rename to service/pycrest/__init__.py
diff --git a/pycrest/compat.py b/service/pycrest/compat.py
similarity index 100%
rename from pycrest/compat.py
rename to service/pycrest/compat.py
diff --git a/pycrest/errors.py b/service/pycrest/errors.py
similarity index 100%
rename from pycrest/errors.py
rename to service/pycrest/errors.py
diff --git a/pycrest/eve.py b/service/pycrest/eve.py
similarity index 98%
rename from pycrest/eve.py
rename to service/pycrest/eve.py
index 0e1ec412e..1c357f9a9 100644
--- a/pycrest/eve.py
+++ b/service/pycrest/eve.py
@@ -1,12 +1,14 @@
 import os
 import base64
-import requests
 import time
 import zlib
-from pycrest import version
-from pycrest.compat import bytes_, text_
-from pycrest.errors import APIException
-from pycrest.weak_ciphers import WeakCiphersAdapter
+
+import requests
+
+from . import version
+from compat import bytes_, text_
+from errors import APIException
+from weak_ciphers import WeakCiphersAdapter
 
 try:
     from urllib.parse import urlparse, urlunparse, parse_qsl
diff --git a/pycrest/weak_ciphers.py b/service/pycrest/weak_ciphers.py
similarity index 100%
rename from pycrest/weak_ciphers.py
rename to service/pycrest/weak_ciphers.py