rpms/python/F-7 python-2.5.1-codec-ascii-tolower.patch, NONE, 1.1 python-2.5.1-plural-fix.patch, NONE, 1.1 python-2.5.1-pysqlite.patch, NONE, 1.1 python-2.5.1-sqlite-encoding.patch, NONE, 1.1 python.spec, 1.108, 1.109
James Antill (james)
fedora-extras-commits at redhat.com
Tue Nov 6 20:51:16 UTC 2007
Author: james
Update of /cvs/pkgs/rpms/python/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30575
Modified Files:
python.spec
Added Files:
python-2.5.1-codec-ascii-tolower.patch
python-2.5.1-plural-fix.patch python-2.5.1-pysqlite.patch
python-2.5.1-sqlite-encoding.patch
Log Message:
* Tue Nov 6 2007 James Antill <jantill at redhat.com> - 2.5.3-15
- Import fixes from Fed-8.
- Resolves: 252136 283331 263221 207134 191096
python-2.5.1-codec-ascii-tolower.patch:
--- NEW FILE python-2.5.1-codec-ascii-tolower.patch ---
diff -rup Python-2.5.1-orig/Python/codecs.c Python-2.5.1/Python/codecs.c
--- Python-2.5.1-orig/Python/codecs.c 2006-06-23 17:16:18.000000000 -0400
+++ Python-2.5.1/Python/codecs.c 2007-10-30 12:51:10.000000000 -0400
@@ -45,6 +45,11 @@ int PyCodec_Register(PyObject *search_fu
return -1;
}
+/* isupper() forced into the ASCII Locale */
+#define ascii_isupper(x) (((x) >= 0x41) && ((x) <= 0x5A))
+/* tolower() forced into the ASCII Locale */
+#define ascii_tolower(x) (ascii_isupper(x) ? ((x) + 0x20) : (x))
+
/* Convert a string to a normalized Python string: all characters are
converted to lower case, spaces are replaced with underscores. */
@@ -70,7 +75,7 @@ PyObject *normalizestring(const char *st
if (ch == ' ')
ch = '-';
else
- ch = tolower(Py_CHARMASK(ch));
+ ch = ascii_tolower(Py_CHARMASK(ch));
p[i] = ch;
}
return v;
Only in Python-2.5.1/Python: codecs.c~
python-2.5.1-plural-fix.patch:
--- NEW FILE python-2.5.1-plural-fix.patch ---
diff -up Python-2.5.1/Lib/gettext.py.plural Python-2.5.1/Lib/gettext.py
--- Python-2.5.1/Lib/gettext.py.plural 2007-09-10 11:38:57.000000000 -0400
+++ Python-2.5.1/Lib/gettext.py 2007-09-10 11:39:00.000000000 -0400
@@ -299,6 +299,8 @@ class GNUTranslations(NullTranslations):
item = item.strip()
if not item:
continue
+ if item.startswith("#"):
+ continue
if ':' in item:
k, v = item.split(':', 1)
k = k.strip().lower()
python-2.5.1-pysqlite.patch:
--- NEW FILE python-2.5.1-pysqlite.patch ---
diff -up Python-2.5.1/Modules/_sqlite/cache.h.pysqlite Python-2.5.1/Modules/_sqlite/cache.h
--- Python-2.5.1/Modules/_sqlite/cache.h.pysqlite 2006-04-23 16:24:26.000000000 +0100
+++ Python-2.5.1/Modules/_sqlite/cache.h 2007-10-25 11:21:31.000000000 +0100
@@ -64,7 +64,7 @@ extern PyTypeObject CacheType;
int node_init(Node* self, PyObject* args, PyObject* kwargs);
void node_dealloc(Node* self);
-int cache_init(Cache* self, PyObject* args, PyObject* kwargs);
+int pysqlite_cache_init(Cache* self, PyObject* args, PyObject* kwargs);
void cache_dealloc(Cache* self);
PyObject* cache_get(Cache* self, PyObject* args);
diff -up Python-2.5.1/Modules/_sqlite/cache.c.pysqlite Python-2.5.1/Modules/_sqlite/cache.c
--- Python-2.5.1/Modules/_sqlite/cache.c.pysqlite 2006-04-23 16:24:26.000000000 +0100
+++ Python-2.5.1/Modules/_sqlite/cache.c 2007-10-25 11:22:10.000000000 +0100
@@ -54,7 +54,7 @@ void node_dealloc(Node* self)
self->ob_type->tp_free((PyObject*)self);
}
-int cache_init(Cache* self, PyObject* args, PyObject* kwargs)
+int pysqlite_cache_init(Cache* self, PyObject* args, PyObject* kwargs)
{
PyObject* factory;
int size = 10;
@@ -352,7 +352,7 @@ PyTypeObject CacheType = {
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
- (initproc)cache_init, /* tp_init */
+ (initproc)pysqlite_cache_init, /* tp_init */
0, /* tp_alloc */
0, /* tp_new */
0 /* tp_free */
python-2.5.1-sqlite-encoding.patch:
--- NEW FILE python-2.5.1-sqlite-encoding.patch ---
diff -up Python-2.5.1/Lib/sqlite3/dbapi2.py.encoding Python-2.5.1/Lib/sqlite3/dbapi2.py
--- Python-2.5.1/Lib/sqlite3/dbapi2.py.encoding 2007-09-14 10:41:50.000000000 -0400
+++ Python-2.5.1/Lib/sqlite3/dbapi2.py 2007-09-14 10:42:00.000000000 -0400
@@ -1,7 +1,6 @@
-#-*- coding: ISO-8859-1 -*-
# pysqlite2/dbapi2.py: the DB-API 2.0 interface
#
-# Copyright (C) 2004-2005 Gerhard Häring <gh at ghaering.de>
+# Copyright (C) 2004-2005 Gerhard Haering <gh at ghaering.de>
#
# This file is part of pysqlite.
#
diff -up Python-2.5.1/Lib/sqlite3/__init__.py.encoding Python-2.5.1/Lib/sqlite3/__init__.py
--- Python-2.5.1/Lib/sqlite3/__init__.py.encoding 2007-09-14 10:41:47.000000000 -0400
+++ Python-2.5.1/Lib/sqlite3/__init__.py 2007-09-14 10:42:06.000000000 -0400
@@ -1,7 +1,6 @@
-#-*- coding: ISO-8859-1 -*-
# pysqlite2/__init__.py: the pysqlite2 package.
#
-# Copyright (C) 2005 Gerhard Häring <gh at ghaering.de>
+# Copyright (C) 2005 Gerhard Haering <gh at ghaering.de>
#
# This file is part of pysqlite.
#
Index: python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python/F-7/python.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- python.spec 19 Oct 2007 13:38:38 -0000 1.108
+++ python.spec 6 Nov 2007 20:50:43 -0000 1.109
@@ -21,7 +21,7 @@
Name: %{python}
#Version: %{pybasever}.3
Version: 2.5
-Release: 14%{?dist}
+Release: 15%{?dist}
License: Python Software Foundation License v2
Group: Development/Languages
Provides: python-abi = %{pybasever}
@@ -38,6 +38,10 @@
Patch7: python-ctypes-execstack.patch
Patch8: python-2.5-xmlrpclib-marshal-objects.patch
Patch9: python-2.5-tkinter.patch
+Patch10: python-2.5.1-plural-fix.patch
+Patch11: python-2.5.1-sqlite-encoding.patch
+Patch12: python-2.5.1-codec-ascii-tolower.patch
+Patch13: python-2.5.1-pysqlite.patch
# upstreamed
Patch25: python-syslog-fail-noatexittb.patch
@@ -182,6 +186,10 @@
%endif
%patch9 -p1 -b .tkinter
+%patch10 -p1 -b .pa
+%patch11 -p1 -b .se
+%patch12 -p1 -b .cat
+%patch13 -p1 -b .pysqlite
%ifarch alpha ia64
# 64bit, but not lib64 arches need this too...
@@ -432,6 +440,10 @@
%{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
%changelog
+* Tue Nov 6 2007 James Antill <jantill at redhat.com> - 2.5.3-15
+- Import fixes from Fed-8.
+- Resolves: 252136 283331 263221 207134 191096
+
* Fri Oct 19 2007 James Antill <jantill at redhat.com> - 2.5.3-14
- Add tkinter patch
- Resolves: #281751
More information about the fedora-extras-commits
mailing list