[Nvda-dev] commit r3092 - in trunk: source user_docs/en

[NVDA S. <sv...@nv...>]

Author: nvda
Date: Thu Jul 30 03:15:57 2009
New Revision: 3092

Log:
Remove fix for #377, which didn't really fix it. :) Damn.

Modified:
   trunk/source/appModuleHandler.py
   trunk/source/winKernel.py
   trunk/user_docs/en/whats new.txt

Modified: trunk/source/appModuleHandler.py
==============================================================================
--- trunk/source/appModuleHandler.py	(original)
+++ trunk/source/appModuleHandler.py	Thu Jul 30 03:15:57 2009
@@ -86,8 +86,7 @@
 	@rtype: str
 	"""
 	for dir in appModules.__path__+['.\\appModules']:
-		fname = os.path.join(winKernel.GetShortPathName(dir), '%s_%s.kbd' % (appName, layout))
-		log.debug("looking for keymap file for %s at %s"%(appName,fname)) 
+		fname = os.path.join(dir, '%s_%s.kbd' % (appName, layout))
 		if os.path.isfile(fname):
 			log.debug("Found keymap file for %s at %s"%(appName,fname)) 
 			return fname
@@ -179,7 +178,7 @@
 	global NVDAProcessID,_importers
 	NVDAProcessID=os.getpid()
 	config.addConfigDirsToPythonPackagePath(appModules)
-	_importers=list(pkgutil.iter_importers(u"appModules._default"))
+	_importers=list(pkgutil.iter_importers("appModules._default"))
 
 #base class for appModules
 class AppModule(baseObject.ScriptableObject):

Modified: trunk/source/winKernel.py
==============================================================================
--- trunk/source/winKernel.py	(original)
+++ trunk/source/winKernel.py	Thu Jul 30 03:15:57 2009
@@ -123,10 +123,3 @@
 
 def GetDriveType(rootPathName):
 	return kernel32.GetDriveTypeW(rootPathName)
-
-def GetShortPathName(LongPath):
-	# This function is not unicode aware because we do need to convert ansi data for the appmoduleHandler. Bah python is giving us ansi paths for the modules
-	len=kernel32.GetShortPathNameA(LongPath,None,0)
-	buf=ctypes.create_string_buffer("", len+1)
-	kernel32.GetShortPathNameA(LongPath,buf,len)
-	return buf.value

Modified: trunk/user_docs/en/whats new.txt
==============================================================================
--- trunk/user_docs/en/whats new.txt	(original)
+++ trunk/user_docs/en/whats new.txt	Thu Jul 30 03:15:57 2009
@@ -39,7 +39,6 @@
 * new: The new Elements List dialog filters the list as you type to contain only those items including the text that was typed. You can press backspace to clear the filter so that all items are again presented. (#173)
 *New: Portable versions of NVDA now look in the 'userConfig' directory inside the NVDA directory, for the user's configuration. Like for the installer version, this keeps the user's configuration separate from NVDA itself.  
 *New: Custom app modules, braille display drivers and synth drivers can now be stored in the user's configuration  directory. (#337)
-*Fix: No longer fail to initialize  while seeking for custom appModules and user configuration directory contains non ascii characters. (#377)
  
 
 Changes since 0.6 P2: