Merge lp:~xaav/wikkid/fix-path into lp:wikkid

Proposed by xaav on 2011-07-13
Status: Needs review
Proposed branch: lp:~xaav/wikkid/fix-path
Merge into: lp:wikkid
Diff against target: 34 lines (+3/-3)
2 files modified
wikkid/dispatcher.py (+2/-2)
wikkid/skin/loader.py (+1/-1)
To merge this branch: bzr merge lp:~xaav/wikkid/fix-path
Reviewer Review Type Date Requested Status
Wikkid Hackers 2011-07-13 Pending
Review via email: mp+67865@code.launchpad.net

Description of the change

bzrlib.urlutils.dirname returns null on windows, and is slower than the native python implementation.

To post a comment you must log in.
lp:~xaav/wikkid/fix-path updated on 2011-07-13
71. By xaav on 2011-07-13

Cleanup.

72. By xaav on 2011-07-13

Fixed skin path issue.

Unmerged revisions

72. By xaav on 2011-07-13

Fixed skin path issue.

71. By xaav on 2011-07-13

Cleanup.

70. By xaav on 2011-07-13

Fixed path issues on windows.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'wikkid/dispatcher.py'
2--- wikkid/dispatcher.py 2010-11-12 09:00:42 +0000
3+++ wikkid/dispatcher.py 2011-07-13 17:31:25 +0000
4@@ -13,7 +13,7 @@
5
6 import os
7
8-from bzrlib.urlutils import dirname, joinpath
9+from bzrlib.urlutils import joinpath
10
11 from zope.interface import providedBy
12
13@@ -69,7 +69,7 @@
14 # themselves with the view registry.
15
16 def load_view_modules():
17- curr_dir = os.path.abspath(dirname(__file__))
18+ curr_dir = os.path.abspath(os.path.dirname(__file__))
19 view_dir = joinpath(curr_dir, 'view')
20 py_files = [
21 filename for filename in os.listdir(view_dir)
22
23=== modified file 'wikkid/skin/loader.py'
24--- wikkid/skin/loader.py 2010-11-05 07:43:31 +0000
25+++ wikkid/skin/loader.py 2011-07-13 17:31:25 +0000
26@@ -39,7 +39,7 @@
27 'missing': self.env.get_template('missing-page.html'),
28 'missing-dir' : self.env.get_template('missing-directory.html')
29 }
30- module_location = urlutils.dirname(__file__)
31+ module_location = os.path.dirname(__file__)
32 self.dir_name = urlutils.joinpath(module_location, skin_name)
33
34 def get_template(self, template_name):

Subscribers

People subscribed via source and target branches