Thread: [pywin32-checkins] pywin32/Pythonwin/pywin/scintilla bindings.py, 1.5.2.2, 1.5.2.3 config.py, 1.6.2
OLD project page for the Python extensions for Windows
Brought to you by:
mhammond
From: Mark H. <mha...@us...> - 2008-12-06 02:16:55
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/scintilla In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3631/Pythonwin/pywin/scintilla Modified Files: Tag: py3k bindings.py config.py keycodes.py Log Message: merge various fixes and changes from the trunk Index: config.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/scintilla/config.py,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -C2 -d -r1.6.2.1 -r1.6.2.2 *** config.py 29 Aug 2008 06:16:42 -0000 1.6.2.1 --- config.py 6 Dec 2008 01:48:26 -0000 1.6.2.2 *************** *** 59,63 **** def find_config_files(): ! return [os.path.split(x)[1] for x in [os.path.splitext(x)[0] for x in glob.glob(os.path.join(pywin.__path__[0], "*.cfg"))]] class ConfigManager: --- 59,65 ---- def find_config_files(): ! return [os.path.split(x)[1] ! for x in [os.path.splitext(x)[0] for x in glob.glob(os.path.join(pywin.__path__[0], "*.cfg"))] ! ] class ConfigManager: *************** *** 281,288 **** self._save_data("extension code", c) except SyntaxError as details: ! msg = details[0] ! errlineno = details[1][1] + start_lineno # Should handle syntax errors better here, and offset the lineno. ! self.report_error("Compiling extension code failed: Line %d: %s" % (errlineno, msg)) return line, lineno --- 283,290 ---- self._save_data("extension code", c) except SyntaxError as details: ! errlineno = details.lineno + start_lineno # Should handle syntax errors better here, and offset the lineno. ! self.report_error("Compiling extension code failed:\r\nFile: %s\r\nLine %d\r\n%s" \ ! % (details.filename, errlineno, details.msg)) return line, lineno Index: bindings.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/scintilla/bindings.py,v retrieving revision 1.5.2.2 retrieving revision 1.5.2.3 diff -C2 -d -r1.5.2.2 -r1.5.2.3 *** bindings.py 27 Nov 2008 11:31:03 -0000 1.5.2.2 --- bindings.py 6 Dec 2008 01:48:26 -0000 1.5.2.3 *************** *** 169,172 **** --- 169,177 ---- # (XXX - which do not work :-( event = self.keymap.get( keyinfo ) + #Enable autoexpand an autocompletion on French keyborads + if keyinfo == (190, 16): + event = "KeyDot" + elif keyinfo == (222, 0): + event = "<<expand-word>>" if event is None: ## if key == 220: # Dead key Index: keycodes.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/scintilla/keycodes.py,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -C2 -d -r1.5.2.1 -r1.5.2.2 *** keycodes.py 29 Aug 2008 06:16:42 -0000 1.5.2.1 --- keycodes.py 6 Dec 2008 01:48:26 -0000 1.5.2.2 *************** *** 31,35 **** def _fillmap(): # Pull the VK_names from win32con ! names = [entry for entry in list(win32con.__dict__.keys()) if entry[:3]=="VK_"] for name in names: n = name[3:].lower() --- 31,35 ---- def _fillmap(): # Pull the VK_names from win32con ! names = [entry for entry in win32con.__dict__ if entry.startswith("VK_")] for name in names: n = name[3:].lower() |