4becc237ee
- photocard.py: fixed broken import statement (bsc#1071255)
* added photocard-fix-import-error-for-pcardext.patch
* spec file: fixed dependency for dbus-1-python (Leap42.2)
- Use python3 on tumbleweed and SLE15/Leap15 (bsc#1071255)
* add pcardext-python3-fixes.patch
* add hplip-misc-missing-includes-and-definitions.patch
* hp_ipp.h-add-missing-prototypes.patch
* spec file: replace "/usr/bin/env python" and "/usr/bin/python" with
desired interpreter
* spec file: add py2/py3 selection macros
* spec file: dropped python-openssl build dependency (not needed anymore)
OBS-URL: https://build.opensuse.org/request/show/589977
OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=151
28 lines
815 B
Diff
28 lines
815 B
Diff
From adca775071398e0dbb87a972798ee82975794640 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Thu, 22 Mar 2018 09:30:38 +0100
|
|
Subject: [PATCH] photocard: fix import error for pcardext
|
|
|
|
Due to the way the C module is installed, explicit relative
|
|
import doesn't work for pcardext.
|
|
---
|
|
pcard/photocard.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/pcard/photocard.py b/pcard/photocard.py
|
|
index 913dc4e98d7f..2c7315883c8d 100644
|
|
--- a/pcard/photocard.py
|
|
+++ b/pcard/photocard.py
|
|
@@ -30,7 +30,7 @@ from base.codes import *
|
|
from base import device, utils, exif
|
|
|
|
try:
|
|
- from . import pcardext
|
|
+ import pcardext
|
|
except ImportError:
|
|
if not os.getenv("HPLIP_BUILD"):
|
|
log.error("PCARDEXT could not be loaded. Please check HPLIP installation.")
|
|
--
|
|
2.16.1
|
|
|