Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

"In the face of ambiguity refuse the temptation to guess" -- Tim Peters #29

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

"In the face of ambiguity refuse the temptation to guess" -- Tim Peters #29

wants to merge 13 commits into from

Commits on Jan 19, 2015

  1. remove unnecessary QObjects & fixup super() calls

    @harvimt
    harvimt committed Jan 19, 2015
    Configuration menu
    Copy the full SHA
    847df31 View commit details
    Browse the repository at this point in the history

  2. replace _easycallback with _make_signaller 

    _easycallback is hard to use indirectly to create signals at runtime,
_make_signaller is more flexible & designed specifically to creat
signals at runtime.

_windows used it's own signal creation mechanism, and now it uses the
same one as _call_soon_threadsafe.
    @harvimt
    harvimt committed Jan 19, 2015
    Configuration menu
    Copy the full SHA
    53d6fef View commit details
    Browse the repository at this point in the history

  3. style fix 

    QtModule was imported but unused.
    @harvimt
    harvimt committed Jan 19, 2015
    Configuration menu
    Copy the full SHA
    ec60641 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into depinject5realz

    @harvimt
    harvimt committed Jan 19, 2015
    Configuration menu
    Copy the full SHA
    4ee2e75 View commit details
    Browse the repository at this point in the history

  5. Cleanup imports to use import_module 

    Using import module is cleaner than __import__ in some situations.

This code is much easier to read.
Also eliminates the QtModule variable.
    @harvimt
    harvimt committed Jan 19, 2015
    Configuration menu
    Copy the full SHA
    7e552e4 View commit details
    Browse the repository at this point in the history

  6. QtCore indirection 

    QtCore is only referenced directly by the tests, never in code except in
the initializer for the loop, but everyone else receives a copy of
QtCore from the loop, and never receives it at compile time.
    @harvimt
    harvimt committed Jan 19, 2015
    Configuration menu
    Copy the full SHA
    fed7806 View commit details
    Browse the repository at this point in the history

  7. Use type of app param to QEventLoop to determine which Qt module to use 

    This is a big commit, but any smaller changes would put the project into
a non-working state where everything fails and things crumble and it's
all terrible.

The big change is QtCore, and QApplication are no longer imported by
quamash at import time. Instead, the type of the app parameter to
QEventLoop determines which module is imported (PySide, PyQt4, or
PyQt5). This is fairly robust and should support PySide with Qt5 when
(and if) it is released.

QThreadExecutor now takes in a parameter that should reference
QtCore.QThread.

Changes to tests and CI configuration to use a --qtimpl parameter
instead of the QUAMASH_QTIMPL environment variable.

a new fixture called qtcore was also created so tests (mostly those that
test QThreadExecutor) could access a reference to the QtCore module.

TODO update README
    @harvimt
    harvimt committed Jan 19, 2015
    Configuration menu
    Copy the full SHA
    09586b3 View commit details
    Browse the repository at this point in the history

  8. Better Documentation and Error Messages 

    Before sending in an app value of None was allowed (and the default),
but now that's not allowed, so we should guard against it.

More guards would be against duck-typing.

Wow. There were TWO self.__app is not None assertions.
    @harvimt
    harvimt committed Jan 19, 2015
    Configuration menu
    Copy the full SHA
    556208d View commit details
    Browse the repository at this point in the history

  9. A parent shouldn't inherit properties from it's children. 

    It's crime against nature.
    @harvimt
    harvimt committed Jan 19, 2015
    Configuration menu
    Copy the full SHA
    e660d42 View commit details
    Browse the repository at this point in the history

  10. Only capture necesssary exceptions 

    This way if signal_class() raises AttributeError it won't be caught.
    @harvimt
    harvimt committed Jan 19, 2015
    Configuration menu
    Copy the full SHA
    abb907a View commit details
    Browse the repository at this point in the history

  11. Simplify QThreadWorker

    @aknuds1
    aknuds1 committed Jan 19, 2015
    Configuration menu
    Copy the full SHA
    9b0e646 View commit details
    Browse the repository at this point in the history

  12. Guess qtimpl, but only for tests. Prefer PyQt5, then PyQt4, then PySide

    @harvimt
    harvimt committed Jan 19, 2015
    Configuration menu
    Copy the full SHA
    79a6458 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #30 from aknuds1/depinject5realz 

    Simplify QThreadWorker
    @harvimt
    harvimt committed Jan 19, 2015
    Configuration menu
    Copy the full SHA
    63500e0 View commit details
    Browse the repository at this point in the history