Merge lp:~daniel.bueltmann/openwns-sdk/wrowserplugin-fix into lp:openwns-sdk

Proposed by Daniel Bültmann
Status: Merged
Merged at revision: 173
Proposed branch: lp:~daniel.bueltmann/openwns-sdk/wrowserplugin-fix
Merge into: lp:openwns-sdk
Diff against target: 26 lines (+9/-1)
1 file modified
wnsbase/playground/Core.py (+9/-1)
To merge this branch: bzr merge lp:~daniel.bueltmann/openwns-sdk/wrowserplugin-fix
Reviewer Review Type Date Requested Status
ComNets, RWTH Aachen, University Pending
Review via email: mp+25767@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'wnsbase/playground/Core.py'
2--- wnsbase/playground/Core.py 2009-07-31 05:14:02 +0000
3+++ wnsbase/playground/Core.py 2010-05-21 12:40:54 +0000
4@@ -42,7 +42,7 @@
5 import builtins
6 import plugins.Command
7 import Logger
8-
9+import sys
10
11 class Core:
12 """ This the core of the openwns-sdk project tree management tool 'playground.py'.
13@@ -65,6 +65,14 @@
14 self.warnings = []
15 self.command = None
16
17+ major = int(sys.version_info[0])
18+ minor = int(+sys.version_info[1])
19+ if minor > 5:
20+ self.addPluginPath(os.path.join("/usr","lib", "python%d.%d" % (major, minor), "dist-packages", "openwns", "wrowser", "playgroundPlugins"))
21+ else:
22+ self.addPluginPath(os.path.join("/usr","lib", "python%d.%d" % (major, minor), "site-packages", "openwns", "wrowser", "playgroundPlugins"))
23+
24+
25 def startup(self):
26 """ Loads builtins, plugins and configuration. Setup of the project tree.
27

Subscribers

People subscribed via source and target branches