Permalink
Browse files

We shouldn't need this autodetection anymore in this file now that it…

…'s outside the executable.
  • Loading branch information...
1 parent 5412be0 commit 8eaf1c84a307dc8ad901e5b7076c0fee2eeaec67 @davidstrauss davidstrauss committed May 20, 2012
Showing with 4 additions and 14 deletions.
  1. +4 −14 eltuxusb/el_ui.py
View
@@ -7,20 +7,10 @@
glade_file = 'eltuxusb.glade'
-try:
- # Try the non-PIP case.
- from el_device import * # <- need to clean, dirty
- from el_input import * # <- need to clean, dirty
- from el_parse import * # <- need to clean, dirty
- from el_plot import * # <- need to clean, dirty
-except ImportError:
- # Maybe it's a PIP-installed package.
- from eltuxusb.el_device import * # <- need to clean, dirty
- from eltuxusb.el_input import * # <- need to clean, dirty
- from eltuxusb.el_parse import * # <- need to clean, dirty
- from eltuxusb.el_plot import * # <- need to clean, dirty
- import pkgutil
- glade_file = os.path.join(pkgutil.get_loader("eltuxusb").filename, glade_file)
+from el_device import * # <- need to clean, dirty
+from el_input import * # <- need to clean, dirty
+from el_parse import * # <- need to clean, dirty
+from el_plot import * # <- need to clean, dirty
class eltuxusb:
def __init__(self, debug):

0 comments on commit 8eaf1c8

Please sign in to comment.