← Back to branch summary

~ubuntu-branches/ubuntu/trusty/mayavi2/trusty

« back to all changes in this revision

Viewing changes to tvtk/pyface/ui/qt4/decorated_scene.py

  • Committer: Package Import Robot
  • Author(s): Varun Hiremath
  • Date: 2012-04-23 16:36:45 UTC
  • mfrom: (1.1.11) (2.2.6 sid)
  • Revision ID: package-import@ubuntu.com-20120423163645-wojak95rklqlbi1y
Tags: 4.1.0-1
* New upstream release
* Bump Standards-Version to 3.9.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
tvtk/pyface/ui/qt4/decorated_scene.py
11
11
from os.path import dirname
12
12
 
13
13
import os
14
 
qt_api = os.environ.get('QT_API', 'pyqt')
15
 
if qt_api == 'pyqt':
16
 
    from PyQt4 import QtGui
17
 
else:
18
 
    from PySide import QtGui
 
14
from pyface.qt import QtGui
19
15
 
20
16
# Enthought library imports.
21
17
from pyface.api import ImageResource, FileDialog, OK