Skip to content

Commit 468a0df

Browse files
author
Richard Jones
committed
backporting fix from HEAD
1 parent e7f2d2d commit 468a0df

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

CHANGES.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ are given with the most recent entry first.
55
Fixed:
66
- Add note about installing cgi-bin with a different interpreter
77
- Importing wasn't setting None values explicitly when it should have been
8+
- Fixed import warning regarding 0xffff0000 literal, finally, really this
9+
time. Checked on win2k. (sf bug 786711)
810

911

1012
2003-08-08 0.6.0

roundup/backends/portalocker.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Requires python 1.5.2 or better.
33

44
# ID line added by richard for Roundup file tracking
5-
# $Id: portalocker.py,v 1.6 2003-07-03 23:43:46 richard Exp $
5+
# $Id: portalocker.py,v 1.6.2.1 2003-08-26 00:30:13 richard Exp $
66

77
""" Cross-platform (posix/nt) API for flock-style file locking.
88
@@ -60,8 +60,8 @@
6060
raise RuntimeError("PortaLocker only defined for nt and posix platforms")
6161

6262
if os.name == 'nt':
63-
# eugh, but trying to suppress the warning doesn't work :(
64-
FFFF0000 = 0xffff000 << 4
63+
# eugh, we want 0xffff0000 here, but python 2.3 won't let us :(
64+
FFFF0000 = -65536
6565
def lock(file, flags):
6666
hfile = win32file._get_osfhandle(file.fileno())
6767
# LockFileEx is not supported on all Win32 platforms (Win95, Win98, WinME).

0 commit comments

Comments
 (0)