Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/addons/readfile.py
diff options
context:
space:
mode:
authormike <michael.jmontcalm@gmail.com>2009-11-09 03:10:11 (GMT)
committer mike <michael.jmontcalm@gmail.com>2009-11-09 03:10:11 (GMT)
commit61edb0f742604cd3cc2dc9895cf679765b9b899e (patch)
tree76d882de81c88c970ff5c044db125409aee36cb9 /addons/readfile.py
parent80ebf5d2fc91e0e9359becdd0b344332063951ab (diff)
parent88013b2f9f93c3220812cd3b624db1423ac081ed (diff)
Merge branch 'lp435984' of ../mainlineHEADmaster
Conflicts: addons/gtkwidgeteventfilter.py addons/readfile.py addons/timerevent.py tests/probetests.py tests/run-tests.py tutorius/TProbe.py tutorius/bundler.py tutorius/core.py tutorius/creator.py tutorius/dbustools.py tutorius/engine.py tutorius/filters.py tutorius/properties.py tutorius/service.py
Diffstat (limited to 'addons/readfile.py')
-rw-r--r--addons/readfile.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/readfile.py b/addons/readfile.py
index 9fe2f81..d3b5d76 100644
--- a/addons/readfile.py
+++ b/addons/readfile.py
@@ -16,9 +16,9 @@
import os
-from ..actions import Action
-from ..properties import TFileProperty
-from ..services import ObjectStore
+from .actions import Action
+from .properties import TFileProperty
+from .services import ObjectStore
class ReadFile(Action):
filename = TFileProperty(None)