fixed 0xffff0000 literal. finally.

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@1822 57a73879-2fb5-44c3-a270-3262357dd7e2

diff --git a/CHANGES.txt b/CHANGES.txt
index 47ddc91c7bccf71aa98b99d78051b90ae319832b..41db9d6e8fa5b54129cb6fe6417818121048bb46 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,8 @@ are given with the most recent entry first.
 Fixed:
 - Add note about installing cgi-bin with a different interpreter
 - Importing wasn't setting None values explicitly when it should have been
+- Fixed import warning regarding 0xffff0000 literal, finally, really this
+  time. Checked on win2k. (sf bug 786711)
 
 
 2003-08-08 0.6.0

diff --git a/roundup/backends/portalocker.py b/roundup/backends/portalocker.py
index 47ab263a2a2f157ddaea2860fa815e4e53e24cdd..9c8389e7a87bfd37231d0d99ba62117a5c68ad97 100644 (file)
--- a/roundup/backends/portalocker.py
+++ b/roundup/backends/portalocker.py
@@ -2,7 +2,7 @@
 #                  Requires python 1.5.2 or better.
 
 # ID line added by richard for Roundup file tracking
-# $Id: portalocker.py,v 1.6 2003-07-03 23:43:46 richard Exp $
+# $Id: portalocker.py,v 1.7 2003-08-26 00:29:20 richard Exp $
 
 """ Cross-platform (posix/nt) API for flock-style file locking.
 
@@ -60,8 +60,8 @@ else:
     raise RuntimeError("PortaLocker only defined for nt and posix platforms")
 
 if os.name == 'nt':
-    # eugh, but trying to suppress the warning doesn't work :(
-    FFFF0000 = 0xffff000 << 4
+    # eugh, we want 0xffff0000 here, but python 2.3 won't let us :(
+    FFFF0000 = -65536
     def lock(file, flags):
         hfile = win32file._get_osfhandle(file.fileno())
         # LockFileEx is not supported on all Win32 platforms (Win95, Win98, WinME).