This commit is contained in:
Kovid Goyal 2015-05-19 10:15:47 +05:30
parent c4fd62e3f6
commit 3e180d2fba

View File

@ -22,15 +22,6 @@ from calibre.constants import (iswindows, isosx, islinux, isfrozen,
from calibre.startup import winutil, winutilerror from calibre.startup import winutil, winutilerror
from calibre.utils.icu import safe_chr from calibre.utils.icu import safe_chr
if False and islinux and not getattr(sys, 'frozen', False):
# Imported before PyQt to workaround PyQt util-linux conflict discovered on gentoo
# See http://bugs.gentoo.org/show_bug.cgi?id=317557
# Importing uuid is slow so get rid of this at some point, maybe in a few
# years when even Debian has caught up
# Also remember to remove it from site.py in the binary builds
import uuid
uuid.uuid4()
if False: if False:
# Prevent pyflakes from complaining # Prevent pyflakes from complaining
winutil, winutilerror, __appname__, islinux, __version__ winutil, winutilerror, __appname__, islinux, __version__