aboutsummaryrefslogtreecommitdiff
path: root/sysutils/py-zfs/files/extra-patch-util.py
blob: d1f77623f5619fdcf4544cdfca5021646298b4f8 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
--- util.py.orig	2010-12-23 09:07:09.188744296 +0100
+++ util.py	2010-12-23 09:10:16.315849339 +0100
@@ -28,7 +28,6 @@
 import gettext
 import errno
 import os
-import solaris.misc
 # Note: this module (zfs.util) should not import zfs.ioctl, because that
 # would introduce a circular dependency
 
@@ -37,11 +36,8 @@
 
 dev = open("/dev/zfs", "w")
 
-try:
-	_ = gettext.translation("SUNW_OST_OSLIB", "/usr/lib/locale",
-	    fallback=True).gettext
-except:
-	_ = solaris.misc.gettext
+_ = gettext.translation("SUNW_OST_OSLIB", "/usr/lib/locale",
+    fallback=True).gettext
 
 def default_repr(self):
 	"""A simple __repr__ function."""