Skip to content

Commit

Permalink
Manual fixes and adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
Avasam committed Aug 22, 2023
1 parent 79d9c48 commit 3821e54
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Pythonwin/pywin/framework/scriptutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ def IsOnPythonPath(path):

def GetPackageModuleName(fileName):
"""Given a filename, return (module name, new path).
eg - given "c:\a\b\\c\\my.py", return ("b.c.my",None) if "c:\a" is on sys.path.
If no package found, will return ("my", "c:\a\b\\c")
eg - given "c:\\a\\b\\c\\my.py", return ("b.c.my",None) if "c:\\a" is on sys.path.
If no package found, will return ("my", "c:\\a\\b\\c")
"""
path, fname = os.path.split(fileName)
path = origPath = win32ui.FullPath(path)
Expand Down
2 changes: 1 addition & 1 deletion com/win32com/client/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def GetObject(Pathname=None, Class=None, clsctx=None):
ob = GetObject(Class = "ProgID") or GetObject(Class = clsid) will
connect to an already running instance of the COM object.
ob = GetObject(r"c:\blah\blah\foo.xls") (aka the COM moniker syntax)
ob = GetObject(r"c:\\blah\\blah\\foo.xls") (aka the COM moniker syntax)
will return a ready to use Python wrapping of the required COM object.
Note: You must specifiy one or the other of these arguments. I know
Expand Down
2 changes: 1 addition & 1 deletion com/win32comext/authorization/demos/EditServiceSecurity.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""
Implements a permissions editor for services.
Service can be specified as plain name for local machine,
or as a remote service of the form \\machinename\\service
or as a remote service of the form \\\\machinename\\service
"""

import os
Expand Down
2 changes: 1 addition & 1 deletion isapi/samples/redirector_with_filter.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def HttpFilterProc(self, fc):
# ~ p = urlmap.PhysicalPath
# ~ pos = p.index("\\UC\\")
# ~ p = p[:pos] + p[pos+3:]
# ~ p = r"E:\src\pyisapi\webroot\PyTest\formTest.htm"
# ~ p = "E:\\src\\pyisapi\\webroot\\PyTest\\formTest.htm"
# ~ print "New path is", p
# ~ urlmap.PhysicalPath = p

Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ def finalize_options(self, build_ext):
found_mfc = False
for incl in os.environ.get("INCLUDE", "").split(os.pathsep):
# first is a "standard" MSVC install, second is the Vista SDK.
for candidate in (r"..\src\occimpl.h", r"..\..\src\mfc\occimpl.h"):
for candidate in ("..\\src\\occimpl.h", "..\\..\\src\\mfc\\occimpl.h"):
check = os.path.join(incl, candidate)
if os.path.isfile(check):
self.extra_compile_args.append(
Expand Down Expand Up @@ -543,7 +543,7 @@ def _check_vc(self):
# so find and add them
if vcbase and not atlmfc_found:
atls_lib = glob.glob(
vcbase + r"ATLMFC\lib\{}\atls.lib".format(self.plat_dir)
vcbase + r"ATLMFC\\lib\{}\\atls.lib".format(self.plat_dir)
)
if atls_lib:
self.library_dirs.append(os.path.dirname(atls_lib[0]))
Expand Down
4 changes: 2 additions & 2 deletions win32/Demos/FileSecurityTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import winerror

# get security information
# name=r"c:\autoexec.bat"
# name= r"g:\!workgrp\lim"
# name = "c:\\autoexec.bat"
# name = "g:\\!workgrp\\lim"
name = sys.argv[0]

if not os.path.exists(name):
Expand Down
2 changes: 1 addition & 1 deletion win32/test/test_win32api.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def reg_operation():
pass

def testValues(self):
key_name = r"PythonTestHarness\win32api"
key_name = "PythonTestHarness\\win32api"
## tuples containing value name, value type, data
values = (
(None, win32con.REG_SZ, "This is default unnamed value"),
Expand Down

0 comments on commit 3821e54

Please sign in to comment.