Support the new kiwi's environment api

Change-Id: Ie4b99504d739722827e6d1f58f59f2f03fdb7cb3
stoq · Nov 20, 2014 · 8e2025e · 8e2025e
1 parent 35ded46
commit 8e2025e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/setup.py b/setup.py
@@ -27,7 +27,5 @@
     license="GNU LGPL 2.1 (see COPYING)",
     packages=listpackages('stoqdrivers'),
     data_files=[("$datadir/conf", listfiles("stoqdrivers/conf", "*.ini"))],
-    global_resources=dict(conf="$datadir/conf"),
-    resources=dict(locale="$prefix/share/locale"),
     install_requires=install_requires,
 )
diff --git a/stoqdrivers/__init__.py b/stoqdrivers/__init__.py
@@ -32,6 +32,4 @@
 __all__ = ["library"]
 
 library = Library("stoqdrivers", root="..")
-if library.uninstalled:
-    library.add_global_resource("conf", "stoqdrivers/conf")
 library.enable_translation()
diff --git a/stoqdrivers/printers/cheque.py b/stoqdrivers/printers/cheque.py
@@ -91,7 +91,8 @@ def get_banks(self):
         configfile = self.__module__.split('.')[-2] + '.ini'
 
         config = ConfigParser()
-        filename = environ.find_resource("conf", configfile)
+        filename = environ.get_resource_filename('stoqdrivers', 'conf',
+                                                 configfile)
         if not config.read(filename):
             return None
         for section in config.sections():