From e70ecc8ac9e351768530670d52a64c2c849f9802 Mon Sep 17 00:00:00 2001
From: Job Evers-Meltzer <jobevers@users.noreply.github.com>
Date: Thu, 27 Oct 2016 14:57:02 -0500
Subject: [PATCH] change settings object for packages too

---
 packaging/osx/lbry-osx-app/lbrygui/LBRYApp.py    | 2 +-
 packaging/osx/lbry-osx-app/setup_app.py          | 6 +++---
 packaging/osx/lbry-osx-app/setup_uri_handler.py  | 6 +++---
 packaging/uri_handler/LBRYURIHandler.py          | 2 +-
 packaging/windows/lbry-win32-app/LBRYWin32App.py | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packaging/osx/lbry-osx-app/lbrygui/LBRYApp.py b/packaging/osx/lbry-osx-app/lbrygui/LBRYApp.py
index 796b9fbeb..ab43236f3 100644
--- a/packaging/osx/lbry-osx-app/lbrygui/LBRYApp.py
+++ b/packaging/osx/lbry-osx-app/lbrygui/LBRYApp.py
@@ -24,7 +24,7 @@ if not os.path.isfile(lbrycrdd_path_conf):
 
 from lbrynet.lbrynet_daemon.DaemonServer import DaemonServer
 from lbrynet.lbrynet_daemon.DaemonRequest import DaemonRequest
-from lbrynet import settings
+from lbrynet.conf import settings
 from lbrynet.core import utils
 
 
diff --git a/packaging/osx/lbry-osx-app/setup_app.py b/packaging/osx/lbry-osx-app/setup_app.py
index 1f4cba717..29169a9da 100644
--- a/packaging/osx/lbry-osx-app/setup_app.py
+++ b/packaging/osx/lbry-osx-app/setup_app.py
@@ -2,14 +2,14 @@
 
 import os
 from setuptools import setup
-from lbrynet.conf import APP_NAME, ICON_PATH
+from lbrynet.conf import settings
 
 APP = [os.path.join('lbrygui', 'main.py')]
 DATA_FILES = []
 DATA_FILES.append('app.icns')
 
 OPTIONS = {
-    'iconfile': ICON_PATH,
+    'iconfile': settings.ICON_PATH,
     'plist': {
         'CFBundleIdentifier': 'io.lbry.LBRY',
         'LSUIElement': True,
@@ -22,7 +22,7 @@ OPTIONS = {
 
 
 setup(
-    name=APP_NAME,
+    name=settings.APP_NAME,
     app=APP,
     options={'py2app': OPTIONS},
     data_files=DATA_FILES,
diff --git a/packaging/osx/lbry-osx-app/setup_uri_handler.py b/packaging/osx/lbry-osx-app/setup_uri_handler.py
index 21b2050a9..62d185e08 100644
--- a/packaging/osx/lbry-osx-app/setup_uri_handler.py
+++ b/packaging/osx/lbry-osx-app/setup_uri_handler.py
@@ -1,6 +1,6 @@
 from setuptools import setup
 import os
-from lbrynet.conf import PROTOCOL_PREFIX
+from lbrynet.conf import settings
 
 APP = [os.path.join('lbry_uri_handler', 'LBRYURIHandler.py')]
 DATA_FILES = []
@@ -12,7 +12,7 @@ OPTIONS = {'argv_emulation': True,
                'CFBundleURLTypes': [
                     {
                     'CFBundleURLTypes': 'LBRYURIHandler',
-                    'CFBundleURLSchemes': [PROTOCOL_PREFIX]
+                    'CFBundleURLSchemes': [settings.PROTOCOL_PREFIX]
                     }
                ]
            }
@@ -23,4 +23,4 @@ setup(
     data_files=DATA_FILES,
     options={'py2app': OPTIONS},
     setup_requires=['py2app'],
-)
\ No newline at end of file
+)
diff --git a/packaging/uri_handler/LBRYURIHandler.py b/packaging/uri_handler/LBRYURIHandler.py
index a46eaecf3..f8d9b081f 100644
--- a/packaging/uri_handler/LBRYURIHandler.py
+++ b/packaging/uri_handler/LBRYURIHandler.py
@@ -5,7 +5,7 @@ import sys
 from time import sleep
 
 from lbrynet.lbrynet_daemon.auth.client import LBRYAPIClient
-from lbrynet import settings
+from lbrynet.conf import settings
 
 
 class LBRYURIHandler(object):
diff --git a/packaging/windows/lbry-win32-app/LBRYWin32App.py b/packaging/windows/lbry-win32-app/LBRYWin32App.py
index a286bdc78..d3591dcab 100644
--- a/packaging/windows/lbry-win32-app/LBRYWin32App.py
+++ b/packaging/windows/lbry-win32-app/LBRYWin32App.py
@@ -21,7 +21,7 @@ except ImportError:
 from lbrynet.core import utils
 from lbrynet.lbrynet_daemon.DaemonServer import DaemonServer
 from lbrynet.lbrynet_daemon.DaemonRequest import DaemonRequest
-from lbrynet import settings
+from lbrynet.conf import settings
 from packaging.uri_handler.LBRYURIHandler import LBRYURIHandler