source: docker/msys/pywin32git.patch@ 968:1128dfecb282

python3
Last change on this file since 968:1128dfecb282 was 920:42b14124051b, checked in by István Váradi <ivaradi@…>, 6 years ago

Win 10 Docker image for building the new Python3-based distribution
File size: 8.9 KB

  • new file .github/issue_template.md 

    diff --git a/.github/issue_template.md b/.github/issue_template.md
new file mode 100644
index 00000000..9c724696
    - +  
     1Note that issues in this repository are only for bugs or feature requests in the pywin32.
     2
     3**If you need support or help using this package, please follow [these instructions](https://github.com/mhammond/pywin32/blob/master/README.md#support)** - support or help requests will be closed without comment.
     4
     5For all bugs, please provide the following information.
     6
     7* Expected behavior and actual behavior.
     8
     9* Steps to reproduce the problem.
     10
     11* Version of Python and pywin32

  • CHANGES.txt 

    diff --git a/CHANGES.txt b/CHANGES.txt
index 4b3fcbe3..d209569c 100644
    a b Generally created by hand after running:  
    44   hg log -rb2xx: > log.out
    55However contributors are encouraged to add their own entries for their work.
    66
     7Since build 224:
     8----------------
     9* PythonWin is now able to start with non-English active keyboard layout.
     10
    711Since build 223:
    812----------------
    913* Built with a released version of Python 3.7, which fixes various date related

  • Pythonwin/pywin/scintilla/keycodes.py 

    diff --git a/Pythonwin/pywin/scintilla/keycodes.py b/Pythonwin/pywin/scintilla/keycodes.py
index 6b783761..d9021828 100644
    a b def get_vk(chardesc):  
    3535        # it is a character.
    3636        info = win32api.VkKeyScan(chardesc)
    3737        if info==-1:
    38             return None, None
     38            # Note: returning None, None causes an error when keyboard layout is non-English, see the report below
     39            # https://stackoverflow.com/questions/45138084/pythonwin-occasionally-gives-an-error-on-opening
     40            return 0, 0
    3941        vk = win32api.LOBYTE(info)
    4042        state = win32api.HIBYTE(info)
    4143        modifiers = 0

  • appveyor.yml 

    diff --git a/appveyor.yml b/appveyor.yml
index a45bdb39..f84cdbc4 100644
    a b environment:  
    2020      PYTHON_MINOR: 5
    2121    - PYTHON_MAJOR: 3
    2222      PYTHON_MINOR: 6
     23    - PYTHON_MAJOR: 3
     24      PYTHON_MINOR: 7
    2325
    2426install:
    2527  # Prepare environment
    … … init:  
    4244  # Following the matrix here: https://wiki.python.org/moin/WindowsCompilers#Which_Microsoft_Visual_C.2B-.2B-_compiler_to_use_with_a_specific_Python_version_.3F
    4345  - if "%PLATFORM%"=="x86" set VC_ARCH=x86
    4446  - if "%PLATFORM%"=="x64" set VC_ARCH=amd64
     47  - if "%PYTHON_MAJOR%"=="3" if "%PYTHON_MINOR%"=="7" set VC_VERSION=14.0
    4548  - if "%PYTHON_MAJOR%"=="3" if "%PYTHON_MINOR%"=="6" set VC_VERSION=14.0
    4649  - if "%PYTHON_MAJOR%"=="3" if "%PYTHON_MINOR%"=="5" set VC_VERSION=14.0
    4750  - if "%PYTHON_MAJOR%"=="3" if "%PYTHON_MINOR%"=="4" set VC_VERSION=10.0

  • setup.py 

    diff --git a/setup.py b/setup.py
index 8c397e1e..7c35d909 100644
    a b com_extensions += [  
    18831883                    depends=["%(internet)s/internet_pch.h" % dirs]),
    18841884    WinExt_win32com('mapi', libraries="advapi32", pch_header="PythonCOM.h",
    18851885                    include_dirs=["%(mapi)s/mapi_headers" % dirs],
     1886                    optional_headers=['edkmdb.h', 'edkguid.h'],
    18861887                    sources=("""
    18871888                        %(mapi)s/mapi.i                 %(mapi)s/mapi.cpp
    18881889                        %(mapi)s/PyIABContainer.i       %(mapi)s/PyIABContainer.cpp
    … … com_extensions += [  
    19111912                        """ % dirs).split()),
    19121913    WinExt_win32com_mapi('exchange', libraries="advapi32",
    19131914                         include_dirs=["%(mapi)s/mapi_headers" % dirs],
     1915                         optional_headers=['edkmdb.h', 'edkguid.h'],
    19141916                         sources=("""
    19151917                                  %(mapi)s/exchange.i         %(mapi)s/exchange.cpp
    19161918                                  %(mapi)s/PyIExchangeManageStore.i %(mapi)s/PyIExchangeManageStore.cpp
    … … cmdclass = { 'install': my_install,  
    24382440             'build_scripts' : my_build_scripts,
    24392441           }
    24402442
     2443classifiers = [ 'Environment :: Win32 (MS Windows)',
     2444                    'Intended Audience :: Developers',
     2445                    'License :: OSI Approved :: Python Software Foundation License',
     2446                    'Operating System :: Microsoft :: Windows',
     2447                    'Programming Language :: Python :: 2.7',
     2448                    'Programming Language :: Python :: 3.5',
     2449                    'Programming Language :: Python :: 3.6',
     2450                    'Programming Language :: Python :: 3.7',
     2451                    'Programming Language :: Python :: Implementation :: CPython',
     2452                  ]
     2453
    24412454dist = setup(name="pywin32",
    24422455      version=str(build_id),
    24432456      description="Python for Window Extensions",
    … … dist = setup(name="pywin32",  
    24492462      author_email = "mhammond@skippinet.com.au",
    24502463      url="https://github.com/mhammond/pywin32",
    24512464      license="PSF",
     2465      classifiers = classifiers,
    24522466      cmdclass = cmdclass,
    24532467      options = {"bdist_wininst":
    24542468                    {"install_script": "pywin32_postinstall.py",

  • win32/Lib/win32con.py 

    diff --git a/win32/Lib/win32con.py b/win32/Lib/win32con.py
index a37967f7..eb6b8a90 100644
    a b PROCESS_CREATE_PROCESS = (128)  
    20602060PROCESS_SET_QUOTA = (256)
    20612061PROCESS_SET_INFORMATION = (512)
    20622062PROCESS_QUERY_INFORMATION = (1024)
     2063PROCESS_SUSPEND_RESUME = (2048)
     2064PROCESS_QUERY_LIMITED_INFORMATION = (4096)
     2065PROCESS_SET_LIMITED_INFORMATION = (8192)
    20632066PROCESS_ALL_ACCESS = (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 4095)
    20642067THREAD_TERMINATE = (1)
    20652068THREAD_SUSPEND_RESUME = (2)
    … … THREAD_QUERY_INFORMATION = (64)  
    20702073THREAD_SET_THREAD_TOKEN = (128)
    20712074THREAD_IMPERSONATE = (256)
    20722075THREAD_DIRECT_IMPERSONATION = (512)
     2076THREAD_SET_LIMITED_INFORMATION = (1024)
     2077THREAD_QUERY_LIMITED_INFORMATION = (2048)
     2078THREAD_RESUME = (4096)
    20732079TLS_MINIMUM_AVAILABLE = 64
    20742080EVENT_MODIFY_STATE = 2
    20752081MUTANT_QUERY_STATE = 1

  • win32/Lib/win32timezone.py 

    diff --git a/win32/Lib/win32timezone.py b/win32/Lib/win32timezone.py
index 83a119dc..6d65af7d 100644
    a b class TimeZoneInfo(datetime.tzinfo):  
    715715        @staticmethod
    716716        def _get_indexed_time_zone_keys(index_key='Index'):
    717717                """
    718                 Get the names of the registry keys indexed by a value in that key.
     718                Get the names of the registry keys indexed by a value in that key,
     719                ignoring any keys for which that value is empty or missing.
    719720                """
    720721                key_names = list(TimeZoneInfo._get_time_zone_key_names())
     722
    721723                def get_index_value(key_name):
    722724                        key = TimeZoneInfo._get_time_zone_key(key_name)
    723                         return key[index_key]
     725                        return key.get(index_key)
     726
    724727                values = map(get_index_value, key_names)
    725                 return zip(values, key_names)
     728
     729                return (
     730                        (value, key_name)
     731                        for value, key_name in zip(values, key_names)
     732                        if value
     733                )
    726734
    727735        @staticmethod
    728736        def get_sorted_time_zone_names():
    … … class _RegKeyDict(dict):  
    786794                except WindowsError: pass
    787795
    788796
    789 # for backward compatibility
    790 def deprecated(func, name='Unknown'):
    791         """This is a decorator which can be used to mark functions
    792         as deprecated. It will result in a warning being emmitted
    793         when the function is used."""
    794         def newFunc(*args, **kwargs):
    795                 warnings.warn("Call to deprecated function %s." % name,
    796                         category=DeprecationWarning)
    797                 return func(*args, **kwargs)
    798         newFunc.__name__ = func.__name__
    799         newFunc.__doc__ = func.__doc__
    800         newFunc.__dict__.update(func.__dict__)
    801         return newFunc
    802 
    803 GetTimeZoneNames = deprecated(TimeZoneInfo._get_time_zone_key_names, 'GetTimeZoneNames')
    804 GetIndexedTimeZoneNames = deprecated(TimeZoneInfo._get_indexed_time_zone_keys, 'GetIndexedTimeZoneNames')
    805 GetSortedTimeZoneNames = deprecated(TimeZoneInfo.get_sorted_time_zone_names, 'GetSortedTimeZoneNames')
    806 # end backward compatibility
    807 
    808797def utcnow():
    809798        """
    810799        Return the UTC time now with timezone awareness as enabled
    … … def resolveMUITimeZone(spec):  
    860849        spec should be of the format @path,-stringID[;comment]
    861850        see http://msdn2.microsoft.com/en-us/library/ms725481.aspx for details
    862851        """
    863         pattern = re.compile('@(?P<dllname>.*),-(?P<index>\d+)(?:;(?P<comment>.*))?')
     852        pattern = re.compile(r'@(?P<dllname>.*),-(?P<index>\d+)(?:;(?P<comment>.*))?')
    864853        matcher = pattern.match(spec)
    865854        assert matcher, 'Could not parse MUI spec'
    866855

  • win32/Lib/winnt.py 

    diff --git a/win32/Lib/winnt.py b/win32/Lib/winnt.py
index 15584efa..021a32b1 100644
    a b PROCESS_CREATE_PROCESS = (128)  
    194194PROCESS_SET_QUOTA = (256)
    195195PROCESS_SET_INFORMATION = (512)
    196196PROCESS_QUERY_INFORMATION = (1024)
     197PROCESS_SUSPEND_RESUME = (2048)
     198PROCESS_QUERY_LIMITED_INFORMATION = (4096)
     199PROCESS_SET_LIMITED_INFORMATION = (8192)
    197200MAXIMUM_PROCESSORS = 32
    198201THREAD_TERMINATE = (1)
    199202THREAD_SUSPEND_RESUME = (2)
    … … THREAD_QUERY_INFORMATION = (64)  
    204207THREAD_SET_THREAD_TOKEN = (128)
    205208THREAD_IMPERSONATE = (256)
    206209THREAD_DIRECT_IMPERSONATION = (512)
     210THREAD_SET_LIMITED_INFORMATION = (1024)
     211THREAD_QUERY_LIMITED_INFORMATION = (2048)
     212THREAD_RESUME = (4096)
    207213JOB_OBJECT_ASSIGN_PROCESS = (1)
    208214JOB_OBJECT_SET_ATTRIBUTES = (2)
    209215JOB_OBJECT_QUERY = (4)
Note: See TracBrowser for help on using the repository browser.