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

[xaav]

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

[lp:~xaav/wikkid/fix-path]

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.

=== modified file 'wikkid/dispatcher.py'
--- wikkid/dispatcher.py	2010-11-12 09:00:42 +0000
+++ wikkid/dispatcher.py	2011-07-13 17:31:25 +0000
@@ -13,7 +13,7 @@
 
 import os
 
-from bzrlib.urlutils import dirname, joinpath
+from bzrlib.urlutils import joinpath
 
 from zope.interface import providedBy
 
@@ -69,7 +69,7 @@
 # themselves with the view registry.
 
 def load_view_modules():
-    curr_dir = os.path.abspath(dirname(__file__))
+    curr_dir = os.path.abspath(os.path.dirname(__file__))
     view_dir = joinpath(curr_dir, 'view')
     py_files = [
         filename for filename in os.listdir(view_dir)
 
=== modified file 'wikkid/skin/loader.py'
--- wikkid/skin/loader.py	2010-11-05 07:43:31 +0000
+++ wikkid/skin/loader.py	2011-07-13 17:31:25 +0000
@@ -39,7 +39,7 @@
             'missing': self.env.get_template('missing-page.html'),
             'missing-dir' : self.env.get_template('missing-directory.html')
             }
-        module_location = urlutils.dirname(__file__)
+        module_location = os.path.dirname(__file__)
         self.dir_name = urlutils.joinpath(module_location, skin_name)
 
     def get_template(self, template_name):