Merge pull request #291 from Ghini/revert-286-ghini-1.0-wininstaller

Revert "windows installer"

bauble/__init__.py

@@ -2,7 +2,6 @@
 #
 # Copyright (c) 2005,2006,2007,2008,2009 Brett Adams <[email protected]>
 # Copyright (c) 2012-2016 Mario Frasca <[email protected]>
-# Copyright (c) 2016 Ross Demuth <[email protected]>
 #
 # This file is part of ghini.desktop.
 #
@@ -218,14 +217,6 @@ def main(uri=None):
     if not os.path.exists(paths.appdata_dir()):
         os.makedirs(paths.appdata_dir())
 
-    # a hack to write stderr and stdout to a file in a py2exe environment
-    # prevents failed attempts at creating ghini.exe.log
-    if main_is_frozen():
-        _stdout = os.path.join(paths.user_dir(), 'stdout.log')
-        _stderr = os.path.join(paths.user_dir(), 'stderr.log')
-        sys.stdout = open(_stdout, 'w')
-        sys.stderr = open(_stderr, 'w')
-
     # add console root handler, and file root handler, set it at the logging
     # level specified by BAUBLE_LOGGING, or at INFO level.
     filename = os.path.join(paths.appdata_dir(), 'bauble.log')

bauble/connmgr.py

@@ -2,7 +2,6 @@
 #
 # Copyright 2008-2010 Brett Adams
 # Copyright 2015-2016 Mario Frasca <[email protected]>.
-# Copyright 2016 Ross Demuth <[email protected]>
 #
 # This file is part of ghini.desktop.
 #
@@ -224,15 +223,9 @@ def __init__(self, view=None):
         except:
             pass
 
-        from bauble import main_is_frozen
-        # Don't check for new versions if we are in a py2exe environment
-        if main_is_frozen():
-            pass
-        else:
-            from threading import Thread
-            self.start_thread(Thread(target=check_and_notify_new_version,
+        from threading import Thread
+        self.start_thread(Thread(target=check_and_notify_new_version,
                                  args=[self.view]))
-        logger.debug('main_is_frozen = %s' % (main_is_frozen()))
 
     def on_file_btnbrowse_clicked(self, *args):
         previously = self.view.widget_get_value('file_entry')

bauble/paths.py

@@ -2,7 +2,6 @@
 #
 # Copyright (c) 2005,2006,2007,2008,2009 Brett Adams <[email protected]>
 # Copyright (c) 2012-2016 Mario Frasca <[email protected]>
-# Copyright (c) 2016 Ross Demuth <[email protected]>
 #
 # This file is part of ghini.desktop.
 #
@@ -90,7 +89,7 @@ def installation_dir():
     elif sys.platform == 'win32':
         # main_dir is the location of the scripts, which is located in the
         # installation_dir:
-        d = main_dir()
+        d = os.path.dirname(main_dir())
     else:
         raise NotImplementedError('This platform does not support '
                                   'translations: %s' % sys.platform)

bauble/utils/web.py

@@ -2,7 +2,6 @@
 #
 # Copyright 2008-2010 Brett Adams
 # Copyright 2014-2017 Mario Frasca <[email protected]>.
-# Copyright 2016 Ross Demuth <[email protected]>
 #
 # This file is part of ghini.desktop.
 #
@@ -32,13 +31,7 @@
 
 
 def _open_link(func, data=None):
-    # windows generates odd characters in the uri unless its in ascii
-    import sys
-    if sys.platform == 'win32' :
-        udata=data.decode("utf-8")
-        asciidata=udata.encode("ascii","ignore")
-        desktop.open(asciidata)
-    else : desktop.open(data)
+    desktop.open(data)
 
 gtk.link_button_set_uri_hook(_open_link)