Changeset 2507

Show
Ignore:
Timestamp:
11/18/08 03:53:58 (8 months ago)
Author:
bzr
Message:

Update NVDA for Python 2.6.
Note that NVDA now *requires* Python 2.6; it will not work with Python 2.5. py2exe 0.6.9 or later must be used for compiling.
A new NVDA misc-deps (2008-11-18-01) is also required.
Please check dependencies.txt for other dependencies that may have changed.

Location:
trunk
Files:
11 modified

Legend:

Unmodified
Added
Removed

  • trunk

    • Property bzr:revision-info

      •  

        old new  
        1 timestamp: 2008-11-18 14:38:07.572999954 +1100 
        2 committer: Michael Curran <mick@kulgan.net> 
         1timestamp: 2008-11-18 13:47:16.186000109 +1000 
         2committer: James Teh <jamie@jantrid.net> 
        33properties:  
        44        branch-nick: main 
    • Property bzr:ancestry:v3-list-QlpoOTFBWSZTWbrL2vUAAB1VgAAQABCAQDrrnqAgAFCgaaGRkxBoTIJ6mmaNRwhndFAoNhZjh_YY4a01fOg1ulgNNC2UrzPdXXEnDpX8XckU4UJC6y9r1A..

      •  

        old new  
        1414jamie@jantrid.net-20081109113343-zabfejnnivsxf2gd 
        1515jamie@jantrid.net-20081111050702-md0ib7fbd6r5scsh 
         16jamie@jantrid.net-20081118034003-w64s6unhiaah225m 
    • Property bzr:revision-id:v3-list-QlpoOTFBWSZTWbrL2vUAAB1VgAAQABCAQDrrnqAgAFCgaaGRkxBoTIJ6mmaNRwhndFAoNhZjh_YY4a01fOg1ulgNNC2UrzPdXXEnDpX8XckU4UJC6y9r1A..

      •  

        old new  
        2762762304 mick@kulgan.net-20081117132147-0s0gw63lue1v5xar 
        2772772305 mick@kulgan.net-20081118033807-iknqrj1jx2n8cfng 
         2782306 jamie@jantrid.net-20081118034716-jk7koc7ahs798gtj 
    • Property bzr:file-ids

      •  

        old new  
         1.bzrignore      bzrignore-20080122021806-b5wx35icn5gbvszl-1 
         2dependencies.txt        46@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:dependencies.txt 
        13source/IAccessibleHandler.py    267@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2FIAccessibleHandler.py 
         4source/NVDAObjects/IAccessible/__init__.py      683@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2FNVDAObjects%2FIAccessible%2F__init__.py 
         5source/queueHandler.py  405@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2FqueueHandler.py 
         6source/sayAllHandler.py 329@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2FsayAllHandler.py 
         7source/setup.py 46@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2Fsetup.py 
         8source/speech.py        503@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2Fspeech.py 
         9source/virtualBuffers/__init__.py       1675@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2FvirtualBuffers%2F__init__.py 
         10source/virtualBuffers/gecko_ia2.py      1694@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2FvirtualBuffers%2Fgecko_ia2.py 
    • Property bzr:text-parents

      •  

        old new  
         1.bzrignore      jamie@jantrid.net-20081118022948-0s909mfs49bqr554 
         2dependencies.txt        jamie@jantrid.net-20081118034003-w64s6unhiaah225m 
         3source/queueHandler.py  jamie@jantrid.net-20081117040816-k2lfa2m4rnqcijeb 
         4source/sayAllHandler.py jamie@jantrid.net-20081117040816-k2lfa2m4rnqcijeb 
         5source/setup.py jamie@jantrid.net-20081118022948-0s909mfs49bqr554 
         6source/virtualBuffers/__init__.py       jamie@jantrid.net-20081117040816-k2lfa2m4rnqcijeb 
         7source/virtualBuffers/gecko_ia2.py      jamie@jantrid.net-20081117040816-k2lfa2m4rnqcijeb 

  • trunk/.bzrignore

    r2436 r2507  
    66source/dist 
    77source/**/*.dll 
     8source/**/*.manifest 
    89source/synthDrivers/espeak-data 
    910source/lib 

  • trunk/dependencies.txt

    r2436 r2507  
    11The NVDA source depends on several other packages to run correctly. Below is a list of the relevant packages along with the URLs where the packages can be obtained. 
    2 Python 2.5, including 2.5.x: 
     2Python 2.6, including 2.6.x: 
    33http://www.python.org/ 
    4 comtypes (for python 2.5), version 0.5.2 or later: 
     4comtypes, version 0.5.2 or later: 
    55http://www.sourceforge.net/projects/comtypes/ 
    6 wxPython unicode (for python 2.5), version 2.8.7.1 or later: 
     6wxPython unicode (for Python 2.6), version 2.8.9.1 or later: 
    77http://www.wxpython.org/ 
    8 Python Windows Extensions (for python 2.5), build 210 only: 
     8Python Windows Extensions (for Python 2.6), build 212 or later: 
    99http://www.sourceforge.net/projects/pywin32/  
    10 Several other packages, made available for convenience in the NVDA miscellaneous dependencies package, version 2008-10-22-01 or later: 
     10Several other packages, made available for convenience in the NVDA miscellaneous dependencies package, version 2008-11-18-01 or later: 
    1111http://www.nvda-project.org/wiki/MiscellaneousDependencies 
    1212 
    13 To build a binary version of NVDA you will also need: 
    14 Py2Exe, version 0.6.6 only: 
     13To build a binary version of NVDA, you will also need: 
     14Py2Exe (for Python 2.6), version 0.6.9 or later: 
    1515http://www.sourceforge.net/projects/py2exe/ 
    1616Nulsoft Install System, version 2.36 or later: 

  • trunk/source/IAccessibleHandler.py

    r2506 r2507  
    207207                """ 
    208208                if eventID==winUser.EVENT_OBJECT_FOCUS: 
    209                         self._focusEventCache[(eventID,window,objectID,childID)]=self._eventCounter.next() 
     209                        self._focusEventCache[(eventID,window,objectID,childID)]=next(self._eventCounter) 
    210210                        return 
    211211                elif eventID==winUser.EVENT_OBJECT_SHOW: 
    … …  
    224224                                del self._genericEventCache[k] 
    225225                                return 
    226                 self._genericEventCache[(eventID,window,objectID,childID)]=self._eventCounter.next() 
     226                self._genericEventCache[(eventID,window,objectID,childID)]=next(self._eventCounter) 
    227227 
    228228        def flushEvents(self): 

  • trunk/source/NVDAObjects/IAccessible/__init__.py

    r2505 r2507  
    289289                else: 
    290290                        newClass=globals()[classString] 
    291                 obj=Window.__new__(newClass,windowHandle=windowHandle) 
     291                obj=Window.__new__(newClass) 
    292292                obj.windowClassName=windowClassName 
    293293                obj.__init__(windowHandle=windowHandle,IAccessibleObject=IAccessibleObject,IAccessibleChildID=IAccessibleChildID,event_windowHandle=event_windowHandle,event_objectID=event_objectID,event_childID=event_childID) 

  • trunk/source/queueHandler.py

    r2177 r2507  
    7474                try: 
    7575                        log.debug("pumping generator %d"%ID) 
    76                         gen.next() 
     76                        next(gen) 
    7777                except StopIteration: 
    7878                        log.debug("generator %s finished"%ID) 

  • trunk/source/sayAllHandler.py

    r2406 r2507  
    157157                        yield 
    158158                        yield 
    159                 updateGen.next() 
     159                next(updateGen) 
    160160                if loopCount>4: 
    161161                        yield 

  • trunk/source/setup.py

    r2493 r2507  
    1515import wx 
    1616 
    17 RT_MANIFEST = 24 #resource number for manifest 
    18  
    19 NVDAManifestText=""" 
    20 <?xml version="1.0" encoding="UTF-8" standalone="yes"?> 
    21 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
    22 <assemblyIdentity 
    23     version="6.0.0.0" 
    24     processorArchitecture="x86" 
    25     name="%(name)s" 
    26     type="win32" 
    27 /> 
    28 <description>%(description)s</description> 
    29 <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> 
    30 <security> 
    31 <requestedPrivileges> 
    32 <requestedExecutionLevel 
    33 level="AsInvoker" 
    34 uiAccess="false" /> 
    35 </requestedPrivileges> 
    36 </security> 
    37 </trustInfo> 
    38 </assembly> 
    39 """%vars() 
    40  
    4117# py2exe insists on excluding certain dlls that don't seem to exist on many systems, so hackishly force them to be included. 
    4218origIsSystemDLL = build_exe.isSystemDLL 
    4319def isSystemDLL(pathname): 
    44         if os.path.basename(pathname).lower() in ("msvcp71.dll", "gdiplus.dll","mfc71.dll"): 
     20        if os.path.basename(pathname).lower() in ("msvcp71.dll", "msvcp90.dll", "gdiplus.dll","mfc71.dll", "mfc90.dll"): 
    4521                return 0 
    4622        return origIsSystemDLL(pathname) 
    … …  
    8763        windows = [{ 
    8864                "script":"nvda.pyw", 
     65                "uac_info": ("asInvoker", False), 
    8966                "icon_resources":[(1,"images/nvda.ico")], 
    90                 "other_resources":[(RT_MANIFEST,1,NVDAManifestText)], 
    9167        }], 
    9268        options = {"py2exe": { 
    … …  
    9975        zipfile = None, 
    10076        data_files=[ 
    101                 (".",glob("*.dll")+["builtin.dic"]), 
     77                (".",glob("*.dll")+glob("*.manifest")+["builtin.dic"]), 
    10278                ("documentation", ['../copying.txt', '../contributors.txt']), 
    10379                ("comInterfaces", glob("comInterfaces/*.pyc")), 

  • trunk/source/speech.py

    r2505 r2507  
    153153        try: 
    154154                # Speak the first character before this function returns. 
    155                 gen.next() 
     155                next(gen) 
    156156        except StopIteration: 
    157157                return 

  • trunk/source/virtualBuffers/__init__.py

    r2479 r2507  
    285285                startOffset, endOffset=VBufClient_getBufferSelectionOffsets(self.VBufHandle) 
    286286                try: 
    287                         docHandle, ID, startOffset, endOffset = self._iterNodesByType(nodeType, direction, startOffset).next() 
     287                        docHandle, ID, startOffset, endOffset = next(self._iterNodesByType(nodeType, direction, startOffset)) 
    288288                except StopIteration: 
    289289                        speech.speakMessage(errorMessage) 

  • trunk/source/virtualBuffers/gecko_ia2.py

    r2468 r2507  
    318318                # Find the next/previous focusable node. 
    319319                try: 
    320                         newDocHandle, newID, newStart, newEnd = self._iterNodesByType("focusable", direction, caretInfo._startOffset).next() 
     320                        newDocHandle, newID, newStart, newEnd = next(self._iterNodesByType("focusable", direction, caretInfo._startOffset)) 
    321321                except StopIteration: 
    322322                        return False