diff options
author | Paweł Jastrzębski <pawelj@vulturis.eu> | 2013-09-29 10:35:20 +0200 |
---|---|---|
committer | Paweł Jastrzębski <pawelj@vulturis.eu> | 2013-09-29 10:35:20 +0200 |
commit | 143b2a7ff59813f42002b13270e21c76d3e4443a (patch) | |
tree | 6bf3d51901ea2b4dc9306f40d32f3ba26d733828 /kcc.py | |
parent | Switching to PyQt correctly evaluates PATH in OS X. (diff) | |
parent | Progress bar don't hide on older Kindle (diff) | |
download | kcc-143b2a7ff59813f42002b13270e21c76d3e4443a.tar.gz kcc-143b2a7ff59813f42002b13270e21c76d3e4443a.tar.bz2 kcc-143b2a7ff59813f42002b13270e21c76d3e4443a.zip |
Merge branch 'v3.3'
Diffstat (limited to 'kcc.py')
-rw-r--r-- | kcc.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/kcc.py b/kcc.py index bcab374..60a0646 100644 --- a/kcc.py +++ b/kcc.py @@ -1,7 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# Copyright (c) 2012 Ciro Mattia Gonano <ciromattia@gmail.com> +# Copyright (c) 2012-2013 Ciro Mattia Gonano <ciromattia@gmail.com> +# Copyright (c) 2013 Pawel Jastrzebski <pawelj@vulturis.eu> # # Permission to use, copy, modify, and/or distribute this software for # any purpose with or without fee is hereby granted, provided that the @@ -17,7 +18,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -__version__ = '3.2.1' +__version__ = '3.3' __license__ = 'ISC' __copyright__ = '2012-2013, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>' __docformat__ = 'restructuredtext en' @@ -32,9 +33,10 @@ except ImportError: exit(1) from kcc import KCC_gui from multiprocessing import freeze_support - -if sys.platform == 'darwin': +if sys.platform.startswith('darwin'): from kcc import KCC_ui_osx as KCC_ui +elif sys.platform.startswith('linux'): + from kcc import KCC_ui_linux as KCC_ui else: from kcc import KCC_ui |