1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123
|
#!/bin/sh -e
## 02_None_rebound.dpatch by Joel Rosdahl <joel@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Removed rebinding of None since Python 2.3 warns about it.
if [ $# -ne 1 ]; then
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
fi
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
case "$1" in
-patch) patch $patch_opts -p1 < $0;;
-unpatch) patch $patch_opts -p1 -R < $0;;
*)
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1;;
esac
exit 0
@DPATCH@
diff -urNad /home/joel/debian/egenix-mx-base-2.0.4/mx/BeeBase/BeeDict.py egenix-mx-base-2.0.4/mx/BeeBase/BeeDict.py
--- /home/joel/debian/egenix-mx-base-2.0.4/mx/BeeBase/BeeDict.py 2003-08-09 14:30:50.000000000 +0200
+++ egenix-mx-base-2.0.4/mx/BeeBase/BeeDict.py 2003-08-09 14:30:59.000000000 +0200
@@ -713,7 +713,7 @@
def commit(self,
- basemethod=BeeBaseDict.commit,None=None):
+ basemethod=BeeBaseDict.commit):
""" Commit all changes and start a new transaction.
"""
@@ -1032,7 +1032,7 @@
def commit(self,
- basemethod=BeeBaseDict.commit,None=None):
+ basemethod=BeeBaseDict.commit):
""" Commit all changes and start a new transaction.
"""
diff -urNad /home/joel/debian/egenix-mx-base-2.0.4/mx/BeeBase/BeeStorage.py egenix-mx-base-2.0.4/mx/BeeBase/BeeStorage.py
--- /home/joel/debian/egenix-mx-base-2.0.4/mx/BeeBase/BeeStorage.py 2003-08-09 14:30:50.000000000 +0200
+++ egenix-mx-base-2.0.4/mx/BeeBase/BeeStorage.py 2003-08-09 14:30:59.000000000 +0200
@@ -432,7 +432,7 @@
def read_header(self,position,
- unpack=struct.unpack,BLOCKSIZE=BLOCKSIZE,None=None,
+ unpack=struct.unpack,BLOCKSIZE=BLOCKSIZE,
ID=ID,headertypes=(OLD,VALID)):
""" Read the header located at position and return
@@ -500,7 +500,7 @@
def write_record(self,data,position,minsize=0,rtype=VALID,
- BLOCKSIZE=BLOCKSIZE,None=None,pack=struct.pack,
+ BLOCKSIZE=BLOCKSIZE,pack=struct.pack,
join=string.join,ID=ID,HOT=HOT):
""" Write a record of given rtype (defaults to VALID)
@@ -611,9 +611,7 @@
delete = free
__delitem__ = free
- def write(self,obj,position=None,
-
- None=None):
+ def write(self,obj,position=None):
""" Write the encoded object to the file and
return the file address where the data was written.
diff -urNad /home/joel/debian/egenix-mx-base-2.0.4/mx/DateTime/DateTime.py egenix-mx-base-2.0.4/mx/DateTime/DateTime.py
--- /home/joel/debian/egenix-mx-base-2.0.4/mx/DateTime/DateTime.py 2003-08-09 14:30:50.000000000 +0200
+++ egenix-mx-base-2.0.4/mx/DateTime/DateTime.py 2003-08-09 14:30:59.000000000 +0200
@@ -537,7 +537,7 @@
def __radd__(self,other,
# Locals:
- None=None,isinstance=isinstance,DateTimeType=DateTimeType,
+ isinstance=isinstance,DateTimeType=DateTimeType,
DateTime=DateTime,DateTimeDelta=DateTimeDelta):
if isinstance(other,DateTimeType):
@@ -640,7 +640,7 @@
def __rsub__(self,other,
# Locals:
- None=None,isinstance=isinstance,DateTime=DateTime):
+ isinstance=isinstance,DateTime=DateTime):
if isinstance(other,DateTimeType):
# DateTime (other) - RelativeDateTime (self)
diff -urNad /home/joel/debian/egenix-mx-base-2.0.4/mx/Tools/mxTools/bench2.py egenix-mx-base-2.0.4/mx/Tools/mxTools/bench2.py
--- /home/joel/debian/egenix-mx-base-2.0.4/mx/Tools/mxTools/bench2.py 2003-08-09 14:30:54.000000000 +0200
+++ egenix-mx-base-2.0.4/mx/Tools/mxTools/bench2.py 2003-08-09 14:31:31.000000000 +0200
@@ -15,7 +15,7 @@
for i in trange(100):
x = tuples(x)
-def f3(apply=apply,map=map,None=None,tuple=tuple):
+def f3(apply=apply,map=map,tuple=tuple):
x = (a,a,a)
for i in trange(100):
diff -urNad /home/joel/debian/egenix-mx-base-2.0.4/mx/Tools/Tools.py egenix-mx-base-2.0.4/mx/Tools/Tools.py
--- /home/joel/debian/egenix-mx-base-2.0.4/mx/Tools/Tools.py 2003-08-09 14:30:50.000000000 +0200
+++ egenix-mx-base-2.0.4/mx/Tools/Tools.py 2003-08-09 14:30:59.000000000 +0200
@@ -895,7 +895,7 @@
def basemethod(object,method=None,
cache = _basemethod_cache,InstanceType=types.InstanceType,
- ClassType=types.ClassType,None=None):
+ ClassType=types.ClassType):
""" Return the unbound method that is defined *after* method in the
inheritance order of object with the same name as method
|