Merge lp:~sneakypete81/zim/pyzim into lp:~jaap.karssenberg/zim/pyzim

[sneakypete]

[sneakypete (sneakypete81)]

Solves problem under Windows where file:///c:/path/to/file was appearing as /c:/path/to/file and then c:\c:\path\to\file, since the lower-case drive letter was not detected.

This problem meant Zim failed to find existing notebooks.

Hope I've done this properly, I'm a launchpad beginner..

[Jaap Karssenberg (jaap.karssenberg)]

Patch looks good to me, will merge it.

review: Approve

[lp:~sneakypete81/zim/pyzim]

193. By sneakypete on 2010-01-29

Add 'Open' to image context menu

194. By sneakypete on 2010-01-29

merged from trunk

[sneakypete (sneakypete81)]

My apologies, Jaap: I've just pushed some extra changes to this branch, and it looks like this merge proposal has been updated too. I didn't expect this to happen.

Please ignore the changes to zim/gui/pageview.py, at least until I've had time to review them properly.

Probably I should have created a new branch for these new changes, correct?

[lp:~sneakypete81/zim/pyzim]

195. By sneakypete on 2010-01-29

backed out changes in rev 193

196. By sneakypete on 2010-01-29

previous backout missed a line

197. By sneakypete on 2010-01-29

whitespace tweak

[sneakypete (sneakypete81)]

Ok, I've backed out my mistaken changes, leaving the original approved merge proposal.

=== modified file 'zim/fs.py'
--- zim/fs.py	2010-01-24 19:23:38 +0000
+++ zim/fs.py	2010-01-29 19:59:11 +0000
@@ -290,7 +290,7 @@
 	@staticmethod
 	def _abspath(path):
 		# Strip leading / for absolute paths
-		if re.match(r'^[/\\][A-Z]:[/\\]', path):
+		if re.match(r'^[/\\][A-Za-z]:[/\\]', path):
 			path = path[1:]
 		return os.path.abspath(path)
 

=== modified file 'zim/parsing.py'
--- zim/parsing.py	2010-01-24 19:23:38 +0000
+++ zim/parsing.py	2010-01-29 19:59:11 +0000
@@ -206,10 +206,10 @@
 is_email_re = Re('^mailto:|^\S+\@\S+\.\w+$')
 	# "mailto:" address
 	# name "@" host
-is_path_re = Re(r'^(/|\.\.?[/\\]|~.*[/\\]|[A-Z]:\\)')
+is_path_re = Re(r'^(/|\.\.?[/\\]|~.*[/\\]|[A-Za-z]:\\)')
 	# / ~/ ./ ../ ~user/  .\ ..\ ~\ ~user\
 	# X:\
-is_win32_path_re = Re(r'^[A-Z]:[\\/]')
+is_win32_path_re = Re(r'^[A-Za-z]:[\\/]')
 	# X:\ (or X:/)
 is_win32_share_re = Re(r'^(\\\\[^\\]+\\.+|smb://)')
 	# \\host\share