Репозиторий Sisyphus
Последнее обновление: 1 октября 2023 | Пакетов: 18631 | Посещений: 37324899
en ru br
Репозитории ALT
S:3.23.8-alt1
5.1: 3.11.5-alt0.M51.1
4.1: 2.8.10-alt2.M41.1
4.0: 2.7.12-alt2.M40.1
+backports:2.8.10-alt2.M40.1
3.0:
+backports:1.6.6a-alt0.M30.4.1
www.altlinux.org/Changes

Группа :: Издательство
Пакет: hplip

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: hplip-add-ppd-crash.patch
Скачать


diff --git a/hplip/setup.py b/hplip/setup.py
index 2608f959f..c6e6b08ef 100755
--- a/hplip/setup.py
+++ b/hplip/setup.py
@@ -553,6 +553,9 @@ else: # INTERACTIVE_MODE
 
                             if file_path.endswith('.gz'):
                                 nickname = gzip.GzipFile(file_path, 'r').read(4096)
+                                if sys.version_info[0] > 2:
+                                    nickname = nickname.decode('utf-8')
+
                             else:
                                 nickname = open(file_path, 'r').read(4096)
 
diff --git a/hplip/ui5/setupdialog.py b/hplip/ui5/setupdialog.py
index 003bd6e0a..646574db7 100644
--- a/hplip/ui5/setupdialog.py
+++ b/hplip/ui5/setupdialog.py
@@ -765,10 +765,9 @@ class SetupDialog(QDialog, Ui_Dialog):
                 pass
 
     def OtherPPDButton_clicked(self, b):
-        ppd_file = to_unicode(QFileDialog.getOpenFileName(self, self.__tr("Select PPD File"),
-                                                          sys_conf.get(
-            'dirs', 'ppd'),
-            self.__tr("PPD Files (*.ppd *.ppd.gz);;All Files (*)")))
+        ppd_file = QFileDialog.getOpenFileName(self, self.__tr("Select PPD File"),
+                                                sys_conf.get('dirs', 'ppd'),
+                                                self.__tr("PPD Files (*.ppd *.ppd.gz);;All Files (*)"))[0]
 
         if ppd_file and os.path.exists(ppd_file):
             self.print_ppd = (ppd_file, cups.getPPDDescription(ppd_file))
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin