summaryrefslogtreecommitdiffstats
path: root/Lib
Commit message (Collapse)AuthorAgeFilesLines
* Add test case for r63810.Georg Brandl2008-05-301-0/+5
|
* Remove basestring usage.Georg Brandl2008-05-301-1/+1
|
* Merged revisions 63460,63464 via svnmerge fromBenjamin Peterson2008-05-292-6/+30
| | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ........ r63460 | ronald.oussoren | 2008-05-18 15:54:47 -0500 (Sun, 18 May 2008) | 6 lines - Add unittests for platform.mac_ver (or rather, ensure that the unittest for that function actually tests something on OSX). - Add documentation to platform.mac_ver that explains why the middle element of the return value will not contain useful information. ........ r63464 | benjamin.peterson | 2008-05-18 17:07:42 -0500 (Sun, 18 May 2008) | 2 lines fix test_platform (os was not imported) ........
* add the gestalt module back as _gestaltBenjamin Peterson2008-05-291-5/+3
|
* Merged revisions 63791-63792 via svnmerge fromThomas Heller2008-05-291-0/+8
| | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ........ r63791 | thomas.heller | 2008-05-29 21:18:12 +0200 (Do, 29 Mai 2008) | 1 line Fix compiler warning. ........ r63792 | thomas.heller | 2008-05-29 21:42:34 +0200 (Do, 29 Mai 2008) | 1 line ctypes NULL function pointers have a boolean False value now. ........
* #2906: accept lists for options, and some cosmetic fixes in Tkinter.Georg Brandl2008-05-291-15/+19
|
* Remove deprecated SmartCookie and SerialCookie classes.Georg Brandl2008-05-282-154/+8
|
* Make db modules' error classes inherit IOError.Georg Brandl2008-05-283-49/+47
| | | | Stop dbm from importing every dbm module when imported.
* Remove __metaclass__ remains.Georg Brandl2008-05-271-1/+1
|
* #2957: marshal recursion limit exceeded when importing a large .pyc fileAmaury Forgeot d'Arc2008-05-261-0/+6
|
* update test ignore listBenjamin Peterson2008-05-261-9/+9
|
* The commands module has been removed. The getoutput() and getstatusoutput()Brett Cannon2008-05-266-135/+103
| | | | | | | | | | functions have been added to the subprocess module. The fixer for this still needs to be written and proper Py3K deprecation warnings for the functions that didn't make the transition need to be done in 2.6. This is all part of trying to close issue #2872.
* Remove _FooCookieJar modules and merge their content into http.cookiejar.Georg Brandl2008-05-263-320/+295
|
* remove test.support.have_unicodeBenjamin Peterson2008-05-263-21/+12
|
* Merged revisions 63542-63544,63546,63553,63563-63564,63567,63569,63576 via ↵Benjamin Peterson2008-05-264-3/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r63542 | mark.dickinson | 2008-05-22 20:35:30 -0500 (Thu, 22 May 2008) | 5 lines Issue #2819: Add math.sum, a function that sums a sequence of floats efficiently but with no intermediate loss of precision. Based on Raymond Hettinger's ASPN recipe. Thanks Jean Brouwers for the patch. ........ r63543 | mark.dickinson | 2008-05-22 21:36:48 -0500 (Thu, 22 May 2008) | 2 lines Add tests for math.sum (Issue #2819) ........ r63544 | mark.dickinson | 2008-05-22 22:30:01 -0500 (Thu, 22 May 2008) | 2 lines Better error reporting in test_math.py ........ r63546 | raymond.hettinger | 2008-05-22 23:32:43 -0500 (Thu, 22 May 2008) | 1 line Tweak the comments and formatting. ........ r63553 | mark.dickinson | 2008-05-23 07:07:36 -0500 (Fri, 23 May 2008) | 3 lines Skip math.sum tests on non IEEE 754 platforms, and on IEEE 754 platforms that exhibit the problem described in issue #2937. ........ r63563 | martin.v.loewis | 2008-05-23 10:18:28 -0500 (Fri, 23 May 2008) | 3 lines Issue #1390: Raise ValueError in toxml when an invalid comment would otherwise be produced. ........ r63564 | raymond.hettinger | 2008-05-23 12:21:44 -0500 (Fri, 23 May 2008) | 1 line Issue 2909: show how to name unpacked fields. ........ r63567 | raymond.hettinger | 2008-05-23 12:34:34 -0500 (Fri, 23 May 2008) | 1 line Fix typo ........ r63569 | martin.v.loewis | 2008-05-23 14:33:13 -0500 (Fri, 23 May 2008) | 3 lines Mention that the leaking of variables from list comprehensions is fixed in 3.0. ........ r63576 | martin.v.loewis | 2008-05-24 04:36:45 -0500 (Sat, 24 May 2008) | 3 lines Don't try to get the window size if it was never set before. Fixes the test failure on Solaris. ........
* Merged revisions 63575 via svnmerge fromGeorg Brandl2008-05-261-1/+1
| | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ........ r63575 | martin.v.loewis | 2008-05-24 11:00:04 +0200 (Sat, 24 May 2008) | 3 lines Use announce instead of print, to suppress output in the testsuite. ........
* Create http package. #2883.Georg Brandl2008-05-2635-869/+721
|
* Merged revisions 63698 via svnmerge fromBenjamin Peterson2008-05-262-0/+14
| | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ........ r63698 | benjamin.peterson | 2008-05-26 11:22:27 -0500 (Mon, 26 May 2008) | 2 lines add __all__ to test_support ........
* fix failing test from renameBenjamin Peterson2008-05-261-8/+8
|
* Merged revisions ↵Benjamin Peterson2008-05-264-16/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63402,63405,63411,63457,63467-63468,63480,63507-63508,63516,63534,63541 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r63402 | raymond.hettinger | 2008-05-16 23:13:36 -0500 (Fri, 16 May 2008) | 1 line Fix-up docstring ........ r63405 | gregory.p.smith | 2008-05-17 02:17:34 -0500 (Sat, 17 May 2008) | 3 lines fix issue2381: test_subprocess fails if your sys.executable is on a path with a space in it. ........ r63411 | lars.gustaebel | 2008-05-17 11:50:22 -0500 (Sat, 17 May 2008) | 8 lines Replace signatures with optional arguments in square brackets with keyword arguments and the actual default values. Fix references that point nowhere or to the wrong place. Add description of the ENCODING module-level variable. Fix the URL pointing to the GNU tar manual. Remove two obsolete examples. Add an example on how to use a generator with TarFile.extractall(). ........ r63457 | ronald.oussoren | 2008-05-18 15:09:54 -0500 (Sun, 18 May 2008) | 9 lines MacOSX: ctypes annotation in implementation of getproxies_macosx_sysconf getproxies_macosx_sysconf uses ctypes to call SystemConfiguration APIs. This checkin adds ctypes annotation to specify the right argument types for the API's that are used. This is needed to be able to use urllib on a 64-bit system, without annotations you'd get a hard crash. ........ r63467 | andrew.kuchling | 2008-05-18 22:03:46 -0500 (Sun, 18 May 2008) | 1 line Re-organize the increasingly long list of deprecated modules ........ r63468 | benjamin.peterson | 2008-05-19 06:55:54 -0500 (Mon, 19 May 2008) | 2 lines just MacOS (instead of MacOS 9) ........ r63480 | neal.norwitz | 2008-05-20 00:21:57 -0500 (Tue, 20 May 2008) | 1 line Add html package so it gets installed and more tests work (from installed copy) ........ r63507 | vinay.sajip | 2008-05-20 10:34:36 -0500 (Tue, 20 May 2008) | 1 line Fixed: #2914 (RFE for UTC support in TimedRotatingFileHandler) and #2929 (wrong filename used to delete old log files). ........ r63508 | vinay.sajip | 2008-05-20 10:37:22 -0500 (Tue, 20 May 2008) | 1 line Updated with fixes for #2914 and #2929. ........ r63516 | martin.v.loewis | 2008-05-21 02:31:31 -0500 (Wed, 21 May 2008) | 2 lines Add Robert Schuppenies. ........ r63534 | brett.cannon | 2008-05-21 22:18:35 -0500 (Wed, 21 May 2008) | 1 line Add Quentin Gallet-Gilles for (at least) a fixer for markupbase. ........ r63541 | raymond.hettinger | 2008-05-22 19:49:27 -0500 (Thu, 22 May 2008) | 1 line Docs for Issue 2819. ........
* Merged revisions 63670 via svnmerge fromThomas Heller2008-05-261-0/+4
| | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ........ r63670 | thomas.heller | 2008-05-26 13:42:40 +0200 (Mo, 26 Mai 2008) | 4 lines On Windows, we must build a debug version iff running a debug build of Python ........
* Create xmlrpc package. Issue #2886.Georg Brandl2008-05-268-495/+313
|
* Rename test file to its proper module name.Georg Brandl2008-05-261-0/+147
|
* Create the dbm package from PEP 3108. #2881.Georg Brandl2008-05-2617-328/+287
|
* Merged revisions ↵Georg Brandl2008-05-2517-65/+862
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r63412 | georg.brandl | 2008-05-17 19:57:01 +0200 (Sat, 17 May 2008) | 2 lines #961805: fix Edit.text_modified(). ........ r63445 | georg.brandl | 2008-05-18 10:52:59 +0200 (Sun, 18 May 2008) | 2 lines GHOP #180 by Michael Schneider: add examples to the socketserver documentation. ........ r63446 | georg.brandl | 2008-05-18 11:12:20 +0200 (Sun, 18 May 2008) | 2 lines GHOP #134, #171, #137: unit tests for the three HTTPServer modules. ........ r63447 | georg.brandl | 2008-05-18 12:39:26 +0200 (Sun, 18 May 2008) | 3 lines Take namedtuple item names only from ascii_letters (this blew up on OSX), and make sure there are no duplicate names. ........ r63449 | georg.brandl | 2008-05-18 13:46:51 +0200 (Sun, 18 May 2008) | 2 lines GHOP #217: add support for compiling Python with coverage checking enabled. ........ r63450 | georg.brandl | 2008-05-18 13:52:36 +0200 (Sun, 18 May 2008) | 2 lines GHOP #257: test distutils' build_ext command, written by Josip Dzolonga. ........ r63452 | georg.brandl | 2008-05-18 15:34:06 +0200 (Sun, 18 May 2008) | 2 lines Add GHOP students. ........ r63454 | georg.brandl | 2008-05-18 18:32:48 +0200 (Sun, 18 May 2008) | 2 lines GHOP #121: improve test_pydoc, by Benjamin Peterson. ........ r63459 | benjamin.peterson | 2008-05-18 22:48:07 +0200 (Sun, 18 May 2008) | 2 lines bring test_pydoc up to my high standards (now that I have them) ........ r63463 | georg.brandl | 2008-05-18 23:10:19 +0200 (Sun, 18 May 2008) | 2 lines Fix test_pyclbr after another platform-dependent function was added to urllib. ........ r63465 | benjamin.peterson | 2008-05-19 01:07:07 +0200 (Mon, 19 May 2008) | 2 lines change some imports in tests so they will not be skipped in 3.0 ........ r63470 | georg.brandl | 2008-05-19 18:47:25 +0200 (Mon, 19 May 2008) | 2 lines test_httpservers has unpredictable refcount behavior. ........ r63483 | georg.brandl | 2008-05-20 08:15:36 +0200 (Tue, 20 May 2008) | 2 lines Activate two more test cases in test_httpservers. ........ r63484 | georg.brandl | 2008-05-20 08:47:31 +0200 (Tue, 20 May 2008) | 2 lines Argh, this is the *actual* test that works under Windows. ........ r63496 | georg.brandl | 2008-05-20 10:07:36 +0200 (Tue, 20 May 2008) | 2 lines Improve diffing logic and output for test_pydoc. ........ r63497 | georg.brandl | 2008-05-20 10:10:03 +0200 (Tue, 20 May 2008) | 2 lines Use inspect.getabsfile() to get the documented module's filename. ........ r63499 | georg.brandl | 2008-05-20 10:25:48 +0200 (Tue, 20 May 2008) | 3 lines Patch #1775025: allow opening zipfile members via ZipInfo instances. Patch by Graham Horler. ........ r63500 | georg.brandl | 2008-05-20 10:40:43 +0200 (Tue, 20 May 2008) | 2 lines #2592: delegate nb_index and the floor/truediv slots in weakref.proxy. ........ r63501 | georg.brandl | 2008-05-20 10:48:34 +0200 (Tue, 20 May 2008) | 2 lines #615772: raise a more explicit error from Tkinter.Misc.__contains__. ........ r63530 | benjamin.peterson | 2008-05-22 02:57:02 +0200 (Thu, 22 May 2008) | 2 lines use more specific asserts in test_opcode ........ r63531 | benjamin.peterson | 2008-05-22 03:02:23 +0200 (Thu, 22 May 2008) | 2 lines remove redundant invocation of json doctests ........ r63540 | benjamin.peterson | 2008-05-23 01:09:26 +0200 (Fri, 23 May 2008) | 3 lines fix test_pydoc so it works on make installed Python installations Also let it pass when invoked directly ........ r63614 | georg.brandl | 2008-05-25 10:07:37 +0200 (Sun, 25 May 2008) | 2 lines #2959: allow multiple close() calls for GzipFile. ........
* Merged revisions 63644 via svnmerge fromMartin v. Löwis2008-05-251-1/+4
| | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ................ r63644 | martin.v.loewis | 2008-05-25 19:19:22 +0200 (So, 25 Mai 2008) | 10 lines Merged revisions 63634-63643 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r63643 | martin.v.loewis | 2008-05-25 19:18:21 +0200 (So, 25 Mai 2008) | 3 lines Don't abort on IOErrors caused by saving pickle files. Fixes #2938. ........ ................
* Fixed old Tkinter import, the last apparentlyGuilherme Polo2008-05-251-1/+1
|
* Merged revisions 63634 via svnmerge fromMartin v. Löwis2008-05-252-9/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ................ r63634 | martin.v.loewis | 2008-05-25 16:58:01 +0200 (So, 25 Mai 2008) | 81 lines Merged revisions 62647-63633 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r63047 | alexandre.vassalotti | 2008-05-11 11:03:24 +0200 (So, 11 Mai 2008) | 2 lines Added import fixer for copy_reg rename. ........ r63081 | alexandre.vassalotti | 2008-05-11 22:06:36 +0200 (So, 11 Mai 2008) | 2 lines Added import fixer for Queue rename. ........ r63090 | alexandre.vassalotti | 2008-05-11 22:38:16 +0200 (So, 11 Mai 2008) | 2 lines Added import fixer for PixMapWrapper rename. ........ r63141 | alexandre.vassalotti | 2008-05-12 04:42:03 +0200 (Mo, 12 Mai 2008) | 5 lines Added fixer for SocketServer renaming. Removed PixMapWrapper fixer, since the module is actually pending removal. ........ r63252 | alexandre.vassalotti | 2008-05-15 01:10:20 +0200 (Do, 15 Mai 2008) | 2 lines Added fixer for ConfigParser rename. ........ r63321 | collin.winter | 2008-05-15 19:42:58 +0200 (Do, 15 Mai 2008) | 1 line Add a missing comma. Fixes issue 2866. ........ r63356 | alexandre.vassalotti | 2008-05-16 08:55:44 +0200 (Fr, 16 Mai 2008) | 4 lines Added new tests for fix_imports. Added refactoring support of from-import statements of the style: from foo import bar, baz ........ r63362 | alexandre.vassalotti | 2008-05-16 09:17:53 +0200 (Fr, 16 Mai 2008) | 2 lines Added the repr module import fixer. ........ r63456 | georg.brandl | 2008-05-18 21:51:18 +0200 (So, 18 Mai 2008) | 2 lines #2908: fixers for Tkinter rename. ........ r63461 | georg.brandl | 2008-05-18 23:00:20 +0200 (So, 18 Mai 2008) | 2 lines Fix for last patch. ........ r63525 | alexandre.vassalotti | 2008-05-21 23:43:29 +0200 (Mi, 21 Mai 2008) | 4 lines Add missing comma in fix_imports. Bug caught by Quentin Gallet-Gilles. ........ r63532 | brett.cannon | 2008-05-22 05:02:43 +0200 (Do, 22 Mai 2008) | 4 lines When testing fix_imports, no need to only test a subset of input; test it all! Do all revisions to the sandbox need to be manually applied to the trunk? ........ r63533 | brett.cannon | 2008-05-22 05:16:45 +0200 (Do, 22 Mai 2008) | 1 line Add _markupbase to the import fixer. ........ r63612 | georg.brandl | 2008-05-25 09:56:59 +0200 (So, 25 Mai 2008) | 2 lines Add fixer for _winreg rename. ........ r63627 | georg.brandl | 2008-05-25 14:30:10 +0200 (So, 25 Mai 2008) | 2 lines Add fixer entry for the thread module. ........ r63629 | georg.brandl | 2008-05-25 14:34:13 +0200 (So, 25 Mai 2008) | 2 lines Fixer entry for dummy_thread. ........ r63633 | martin.v.loewis | 2008-05-25 16:52:41 +0200 (So, 25 Mai 2008) | 2 lines Temporarily disable Test_imports. ........ ................
* Rename thread to _thread and dummy_thread to _dummy_thread. Issue #2875.Georg Brandl2008-05-2525-87/+83
|
* #2967: Tkinter -> tkinter in test_tcl.Georg Brandl2008-05-251-1/+1
|
* #2879: rename _winreg to winreg.Georg Brandl2008-05-255-38/+38
|
* Fix Queue -> queue.Georg Brandl2008-05-251-1/+1
|
* fix skipped test due to import problemBenjamin Peterson2008-05-231-1/+1
|
* Merged revisions 63395-63396,63511,63522-63523 via svnmerge fromThomas Heller2008-05-234-6/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ........ r63395 | thomas.heller | 2008-05-16 22:06:31 +0200 (Fr, 16 Mai 2008) | 4 lines Issue 1793: Add ctypes.util.find_msvcrt() function (on Windows). ........ r63396 | thomas.heller | 2008-05-16 22:19:07 +0200 (Fr, 16 Mai 2008) | 4 lines Very simple test for ctypes.util.find_library on Windows. ........ r63511 | thomas.heller | 2008-05-20 21:53:47 +0200 (Di, 20 Mai 2008) | 6 lines On HPUX, -fPIC must be used for linking. _ctypes now builds on HP-UX IA64 and PA machines. The ctypes unittests work fine on the IA64, but dump core in test_qsort on the PA. ........ r63522 | thomas.heller | 2008-05-21 20:47:02 +0200 (Mi, 21 Mai 2008) | 2 lines The -x <test1[,test2...]> flag allows to exclude tests. ........ r63523 | thomas.heller | 2008-05-21 21:47:44 +0200 (Mi, 21 Mai 2008) | 2 lines Oops, get_tests may be called with 3 arguments. ........
* Change test_htmlparser to reflect the HTMLParser -> html.parserMark Dickinson2008-05-212-6/+6
| | | | | | rename in r63439. Also fix one occurrence of unichr() in html.parser.
* #2621 rename test.test_support to test.supportBenjamin Peterson2008-05-20356-1302/+1301
|
* Ignore test_c_api when checking for set methods. Thanks Brett!Georg Brandl2008-05-181-1/+1
|
* Better diagnostic.Georg Brandl2008-05-181-1/+2
|
* Add a test suite for WeakSet mostly derived from test_set and fix someGeorg Brandl2008-05-182-12/+353
| | | | issues in the weakset implementation discovered with it.
* #2905: fix merge glitch on OSX.Georg Brandl2008-05-181-16/+16
|
* Fix two issues in the weak set implementation.Georg Brandl2008-05-181-2/+5
|
* rename HTMLParser to html.parser and htmlentitydefs to html.entities;Fred Drake2008-05-177-11/+13
| | | | includes merge of trunk revision 63432
* Tkinter, step 4: merge simple- and filedialog modules.Georg Brandl2008-05-174-535/+516
|
* Tkinter, step 2: adapt imports.Georg Brandl2008-05-1750-133/+136
|
* Tkinter move, part 1: move modules.Georg Brandl2008-05-1714-0/+0
|
* Fixed signature of theThread in test_lock.Alexandre Vassalotti2008-05-161-1/+1
| | | | This was bug introduced by merge r63352.
* Merged revisions 63361-63373,63375,63377-63380 via svnmerge fromAlexandre Vassalotti2008-05-164-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ........ r63361 | alexandre.vassalotti | 2008-05-16 03:14:08 -0400 (Fri, 16 May 2008) | 2 lines Rename the test file of reprlib. ........ r63364 | georg.brandl | 2008-05-16 05:34:48 -0400 (Fri, 16 May 2008) | 2 lines Make generator repr consistent with function and code object repr. ........ r63365 | georg.brandl | 2008-05-16 05:47:29 -0400 (Fri, 16 May 2008) | 2 lines #2869: remove parameter from signature. ........ r63366 | christian.heimes | 2008-05-16 06:23:31 -0400 (Fri, 16 May 2008) | 1 line Fixed #2870: cmathmodule.c compile error ........ r63367 | christian.heimes | 2008-05-16 07:28:56 -0400 (Fri, 16 May 2008) | 1 line Following Amaury's advice ........ r63368 | georg.brandl | 2008-05-16 09:10:15 -0400 (Fri, 16 May 2008) | 2 lines #2890: support os.O_ASYNC and fcntl.FASYNC. ........ r63369 | georg.brandl | 2008-05-16 09:18:50 -0400 (Fri, 16 May 2008) | 2 lines #2845: fix copy2's docs. ........ r63370 | georg.brandl | 2008-05-16 09:24:29 -0400 (Fri, 16 May 2008) | 2 lines Don't allow keyword arguments to reversed(). ........ r63373 | georg.brandl | 2008-05-16 09:41:26 -0400 (Fri, 16 May 2008) | 2 lines Document O_ASYNC addition. ........ r63380 | georg.brandl | 2008-05-16 13:33:13 -0400 (Fri, 16 May 2008) | 2 lines Fix reprlib docs. ........
* #2895: don't crash with bytes as keyword argument names.Georg Brandl2008-05-161-0/+8
|
* Rename the repr module file to reprlib.py.Alexandre Vassalotti2008-05-161-0/+0
| | | | I was sure I had done so in r63360. That is weird...
* Rename the repr module to reprlib.Alexandre Vassalotti2008-05-168-21/+20
| | | | | | | | | | | Merged revisions 63357 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r63357 | alexandre.vassalotti | 2008-05-16 02:58:49 -0400 (Fri, 16 May 2008) | 2 lines Changed references to the reprlib module to use its new name. ........