diff options
| author | Seth Hitefield <sdhitefield@gmail.com> | 2017-07-30 17:58:36 -0400 |
|---|---|---|
| committer | Seth Hitefield <sdhitefield@gmail.com> | 2017-07-30 17:58:36 -0400 |
| commit | 82e2e9eb63ae92ad55a28a8c01564de5045b8056 (patch) | |
| tree | 6c88a7cc07330fc0fa5aecd817d2df730b8919d8 | |
| parent | 26ddf9a6597eb92d7be7673430f6f2915a60c7dd (diff) | |
grc: Starts on both Python 2 and 3
| -rw-r--r-- | grc/converter/main.py | 3 | ||||
| -rw-r--r-- | grc/gui/Dialogs.py | 5 | ||||
| -rwxr-xr-x | grc/main.py | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/grc/converter/main.py b/grc/converter/main.py index e5a836f511..5a18471fc7 100644 --- a/grc/converter/main.py +++ b/grc/converter/main.py @@ -64,6 +64,7 @@ class Converter(object): self._force = force try: + logger.debug("Loading block cache from: {}".format(self.cache_file)) with open(self.cache_file, encoding='utf-8') as cache_file: self.cache = byteify(json.load(cache_file)) except (IOError, ValueError): @@ -158,7 +159,7 @@ def byteify(data): return {byteify(key): byteify(value) for key, value in six.iteritems(data)} elif isinstance(data, list): return [byteify(element) for element in data] - elif isinstance(data, unicode): + elif isinstance(data, six.text_type) and six.PY2: return data.encode('utf-8') else: return data diff --git a/grc/gui/Dialogs.py b/grc/gui/Dialogs.py index 45c9095313..f58ea78ca2 100644 --- a/grc/gui/Dialogs.py +++ b/grc/gui/Dialogs.py @@ -265,14 +265,17 @@ def show_about(parent, config): ad = Gtk.AboutDialog(transient_for=parent) ad.set_program_name(config.name) ad.set_name('') - ad.set_version(config.version) ad.set_license(config.license) + py_version = sys.version.split()[0] + ad.set_version("{} (Python {})".format(config.version, py_version)) + try: ad.set_logo(Gtk.IconTheme().load_icon('gnuradio-grc', 64, 0)) except: pass + #ad.set_comments("") ad.set_copyright(config.license.splitlines()[0]) ad.set_website(config.website) diff --git a/grc/main.py b/grc/main.py index 2d182c226f..4f4cd68704 100755 --- a/grc/main.py +++ b/grc/main.py @@ -71,7 +71,8 @@ def main(): console.setFormatter(formatter) log.addHandler(console) - log.debug("Running main") + py_version = sys.version.split()[0] + log.debug("Starting GNU Radio Companion ({})".format(py_version)) # Delay importing until the logging is setup from .gui.Platform import Platform |