← Back to branch summary

~roadmr/checkbox/1311462-remove-n-requirement

« back to all changes in this revision

Viewing changes to plainbox/plainbox/impl/session/__init__.py

  • Committer: Daniel Manrique
  • Author(s): Zygmunt Krynicki
  • Date: 2014-04-30 22:33:31 UTC
  • mfrom: (2960.3.5 launchpad/session-peek-api)
  • Revision ID: daniel_manrique-20140430223331-s169swog501m28og
"automatic merge by tarmac [r=roadmr][bug=1272762][author=zkrynicki]"

Show diffs side-by-side

added added

removed removed

Lines of Context:
plainbox/plainbox/impl/session/__init__.py
79
79
    'JobState',
80
80
    'SessionManager',
81
81
    'SessionMetaData',
 
82
    'SessionPeekHelper',
82
83
    'SessionState',
83
84
    'SessionStateLegacyAPI',
84
85
    'SessionStorage',
91
92
from plainbox.impl.session.jobs import UndesiredJobReadinessInhibitor
92
93
from plainbox.impl.session.legacy import SessionStateLegacyAPI
93
94
from plainbox.impl.session.manager import SessionManager
 
95
from plainbox.impl.session.resume import SessionPeekHelper
 
96
from plainbox.impl.session.state import SessionMetaData
94
97
from plainbox.impl.session.state import SessionState
95
 
from plainbox.impl.session.state import SessionMetaData
96
98
from plainbox.impl.session.storage import SessionStorage
97
99
from plainbox.impl.session.storage import SessionStorageRepository