]> granicus.if.org Git - python/log
python
14 years agoReally fix issue #10898: posixmodule.c redefines FSTAT
Antoine Pitrou [Fri, 1 Jul 2011 20:56:03 +0000 (22:56 +0200)]
Really fix issue #10898: posixmodule.c redefines FSTAT

14 years agoIssue #11870: Skip test_threading.test_2_join_in_forked_process() on platforms
Victor Stinner [Fri, 1 Jul 2011 13:04:03 +0000 (15:04 +0200)]
Issue #11870: Skip test_threading.test_2_join_in_forked_process() on platforms
with known OS bugs

Share the list of platforms with known OS bugs with other tests. Patch written
by Charles-François Natali.

14 years agoFixup repr for dict_proxy objects.
Raymond Hettinger [Wed, 29 Jun 2011 23:44:36 +0000 (00:44 +0100)]
Fixup repr for dict_proxy objects.

14 years agoMerge 2.7
Ned Deily [Wed, 29 Jun 2011 03:13:03 +0000 (20:13 -0700)]
Merge 2.7

14 years agomerge 2.6
Benjamin Peterson [Wed, 29 Jun 2011 02:58:27 +0000 (21:58 -0500)]
merge 2.6

14 years agofix ws
Benjamin Peterson [Wed, 29 Jun 2011 02:57:21 +0000 (21:57 -0500)]
fix ws

14 years agoIssue #9516: Update Misc/NEWS.
Ned Deily [Wed, 29 Jun 2011 02:52:59 +0000 (19:52 -0700)]
Issue #9516: Update Misc/NEWS.

14 years agoIssue #9516: Change distutils to no longer globally attempt to check and
Ned Deily [Wed, 29 Jun 2011 02:40:39 +0000 (19:40 -0700)]
Issue #9516: Change distutils to no longer globally attempt to check and
set the MACOSX_DEPLOYMENT_TARGET env variable for the interpreter process
on OS X.  This could cause failures in non-distutils subprocesses and was
unreliable since tests or user programs could modify the interpreter
environment after distutils set it.  Instead, have distutils set the
the deployment target only in the environment of each build subprocess.

Continue to use the previous algorithm for deriving the deployment target
value:
    if MACOSX_DEPLOYMENT_TARGET is not set in the interpreter's env:
        use the interpreter build configure MACOSX_DEPLOYMENT_TARGET
    elif the MACOSX_DEPLOYMENT_TARGET env value >= configure value:
        use the env MACOSX_DEPLOYMENT_TARGET
    else: # env value less than interpreter build configure value
        raise exception
This allows building extensions that can only run on newer versions of
the OS than the version python was built for, for example with a python
built for 10.3 or later and an extension that needs to be built for 10.5.

14 years agoIssue #9516: Correct and expand OS X deployment target tests in distutils
Ned Deily [Wed, 29 Jun 2011 02:39:10 +0000 (19:39 -0700)]
Issue #9516: Correct and expand OS X deployment target tests in distutils
test_build_ext.

14 years agoMinimal changes to make byext.py script work with Python 3 syntax.
Guido van Rossum [Tue, 28 Jun 2011 17:33:38 +0000 (10:33 -0700)]
Minimal changes to make byext.py script work with Python 3 syntax.

14 years agoIssue #12141: Install a copy of template C module file so that
Ned Deily [Tue, 28 Jun 2011 07:39:19 +0000 (00:39 -0700)]
Issue #12141: Install a copy of template C module file so that
test_build_ext of test_distutils is no longer silently skipped when
run outside of a build directory.

14 years agoIssue #8746: Correct faulty configure checks so that os.chflags() and
Ned Deily [Tue, 28 Jun 2011 06:41:53 +0000 (23:41 -0700)]
Issue #8746: Correct faulty configure checks so that os.chflags() and
os.lchflags() are once again built on systems that support these
functions (*BSD and OS X).  Also add new stat file flags for OS X
(UF_HIDDEN and UF_COMPRESSED).  Also add additional tests for
os.chflags() and os.lchflags(). (Tests by Garrett Cooper)

14 years agoIssue #10736: Fix test_ttk test_widgets failures with Cocoa Tk 8.5.9
Ned Deily [Tue, 28 Jun 2011 06:09:31 +0000 (23:09 -0700)]
Issue #10736: Fix test_ttk test_widgets failures with Cocoa Tk 8.5.9
on Mac OS X.  (Patch by Ronald Oussoren)

14 years agofix ws
Benjamin Peterson [Mon, 27 Jun 2011 22:51:18 +0000 (17:51 -0500)]
fix ws

14 years agoadd more ast tests (closes #11302)
Benjamin Peterson [Mon, 27 Jun 2011 22:46:06 +0000 (17:46 -0500)]
add more ast tests (closes #11302)

A patch from Vincent Legoll.

14 years agostrip trailing ws
Benjamin Peterson [Mon, 27 Jun 2011 14:18:46 +0000 (09:18 -0500)]
strip trailing ws

14 years agomerge heads
Benjamin Peterson [Mon, 27 Jun 2011 14:16:23 +0000 (09:16 -0500)]
merge heads

14 years agoupdate profile license (closes #12417)
Benjamin Peterson [Mon, 27 Jun 2011 14:14:34 +0000 (09:14 -0500)]
update profile license (closes #12417)

14 years agoupdate profile license (closes #12417)
Benjamin Peterson [Mon, 27 Jun 2011 14:14:34 +0000 (09:14 -0500)]
update profile license (closes #12417)

14 years agoFix closes issue 11568 - update select.epoll.register docstring with mention of corre...
Senthil Kumaran [Mon, 27 Jun 2011 06:50:35 +0000 (23:50 -0700)]
Fix closes issue 11568 - update select.epoll.register docstring with mention of correct behavior.

14 years agoFix closes issue1067702 The problem with close multiple ftp transfers were due cases...
Senthil Kumaran [Sun, 26 Jun 2011 20:45:17 +0000 (13:45 -0700)]
Fix closes issue1067702  The problem with close multiple ftp transfers were due cases where sockets/file were not closed immediately. Tightned those cases and failure is no longer observed.

14 years ago#11363: add missing functions from curses doc. Patch by Sandro Tosi.
Ezio Melotti [Sun, 26 Jun 2011 10:34:56 +0000 (13:34 +0300)]
#11363: add missing functions from curses doc. Patch by Sandro Tosi.

14 years ago#11363: clean up curses doc.
Ezio Melotti [Sun, 26 Jun 2011 10:33:46 +0000 (13:33 +0300)]
#11363: clean up curses doc.

14 years ago#11669: rephrase footnote in the Compound Statements page.
Ezio Melotti [Sun, 26 Jun 2011 08:25:28 +0000 (11:25 +0300)]
#11669: rephrase footnote in the Compound Statements page.

14 years agoFix Issue10020 - Doc update to sqlite3 module in 2.7 branch.
Senthil Kumaran [Sun, 26 Jun 2011 03:48:21 +0000 (20:48 -0700)]
Fix Issue10020 - Doc update to sqlite3 module in 2.7 branch.

14 years agoUse correct markup in zipimport.rst. Patch by Sara Magliacane.
Ezio Melotti [Sat, 25 Jun 2011 16:40:06 +0000 (19:40 +0300)]
Use correct markup in zipimport.rst. Patch by Sara Magliacane.

14 years ago#12341: add coverage files/dirs to .hgignore. Patch by Sandro Tosi.
Ezio Melotti [Sat, 25 Jun 2011 17:19:54 +0000 (20:19 +0300)]
#12341: add coverage files/dirs to .hgignore. Patch by Sandro Tosi.

14 years agoIssue 11802: filecmp cache was growing without bound.
Raymond Hettinger [Sat, 25 Jun 2011 15:14:53 +0000 (17:14 +0200)]
Issue 11802:  filecmp cache was growing without bound.

14 years agoIssue 12086: add example showing how to use name mangling.
Raymond Hettinger [Sat, 25 Jun 2011 14:28:07 +0000 (16:28 +0200)]
Issue 12086: add example showing how to use name mangling.

14 years agoIssue 11889: Clarify docs for enumerate.
Raymond Hettinger [Sat, 25 Jun 2011 12:57:06 +0000 (14:57 +0200)]
Issue 11889: Clarify docs for enumerate.

14 years agoIssue 10326: Fix regression to get test cases to pickle again.
Raymond Hettinger [Sat, 25 Jun 2011 10:16:25 +0000 (12:16 +0200)]
Issue 10326: Fix regression to get test cases to pickle again.

14 years agomerge
Mark Dickinson [Sat, 25 Jun 2011 10:02:53 +0000 (12:02 +0200)]
merge

14 years agoIssue #12228: Fix exchanged flag descriptions in stat.rst. Thanks Sandro Tosi.
Mark Dickinson [Sat, 25 Jun 2011 10:01:06 +0000 (12:01 +0200)]
Issue #12228: Fix exchanged flag descriptions in stat.rst.  Thanks Sandro Tosi.

14 years agoCode simplification suggested by Sven Marnach.
Raymond Hettinger [Sat, 25 Jun 2011 09:24:35 +0000 (11:24 +0200)]
Code simplification suggested by Sven Marnach.

14 years agoIssue #12164: Document (in docstring) that str.translate accepts None for the first...
Mark Dickinson [Sat, 25 Jun 2011 09:00:12 +0000 (11:00 +0200)]
Issue #12164: Document (in docstring) that str.translate accepts None for the first argument.

14 years agoIssue 12404: Remove C89 incompatible code from mmap module.
Ross Lagerwall [Sat, 25 Jun 2011 07:55:10 +0000 (09:55 +0200)]
Issue 12404: Remove C89 incompatible code from mmap module.

Patch by Akira Kitada.

14 years ago#9921: clarify os.path.join joining algorithm
R David Murray [Fri, 24 Jun 2011 01:19:25 +0000 (21:19 -0400)]
#9921: clarify os.path.join joining algorithm

The new wording is based on the comments in the code, which
match the actual behavior.

14 years ago#12389: fix missing space at sentence end.
R David Murray [Thu, 23 Jun 2011 00:00:27 +0000 (20:00 -0400)]
#12389: fix missing space at sentence end.

14 years agoRevert d370d609d09b as requested by Terry Jan Reedy:
Victor Stinner [Mon, 20 Jun 2011 20:07:06 +0000 (22:07 +0200)]
Revert d370d609d09b as requested by Terry Jan Reedy:

"#3067: locale.setlocale() accepts a Unicode locale."

14 years agoIssue #12285: multiprocessing.Pool() raises a ValueError if the number of
Victor Stinner [Mon, 20 Jun 2011 15:54:33 +0000 (17:54 +0200)]
Issue #12285: multiprocessing.Pool() raises a ValueError if the number of
processes if negative or null.

14 years agomerge heads
Senthil Kumaran [Mon, 20 Jun 2011 14:37:03 +0000 (07:37 -0700)]
merge heads

14 years agomerge 3.2 - Fix closes Issue12359 - Removing a confusing sentence from the previous...
Senthil Kumaran [Mon, 20 Jun 2011 14:34:48 +0000 (07:34 -0700)]
merge 3.2 - Fix closes Issue12359 - Removing a confusing sentence from the previous change.

14 years agoClose #3067: locale.setlocale() accepts a Unicode locale.
Victor Stinner [Mon, 20 Jun 2011 14:14:48 +0000 (16:14 +0200)]
Close #3067: locale.setlocale() accepts a Unicode locale.

14 years agoFix issue12359. Minor doc update on import module description.
Senthil Kumaran [Mon, 20 Jun 2011 00:45:36 +0000 (17:45 -0700)]
Fix issue12359. Minor doc update on import module description.

14 years ago#6771: fix docs: curses.wrapper is exposed as a function, not a module
R David Murray [Sat, 18 Jun 2011 23:31:22 +0000 (19:31 -0400)]
#6771: fix docs: curses.wrapper is exposed as a function, not a module

Patch by July Tikhonov.

14 years ago#11700: proxy object close methods can now be called multiple times
R David Murray [Sat, 18 Jun 2011 02:23:04 +0000 (22:23 -0400)]
#11700: proxy object close methods can now be called multiple times

This makes them work like the close provided by regular file objects.  This
patch also backports the close-the-underlying-file code for _ProxyFile objects
that was introduced along with context manager support in the 3.x branch.

14 years agoIssue #12133: AbstractHTTPHandler.do_open() of urllib.request closes the HTTP
Victor Stinner [Fri, 17 Jun 2011 12:06:27 +0000 (14:06 +0200)]
Issue #12133: AbstractHTTPHandler.do_open() of urllib.request closes the HTTP
connection if its getresponse() method fails with a socket error. Patch written
by Ezio Melotti.

14 years agoupdate link to pycrypto (closes #12351)
Benjamin Peterson [Thu, 16 Jun 2011 23:49:46 +0000 (18:49 -0500)]
update link to pycrypto (closes #12351)

14 years agoCloses #12206: documentation update for LogRecord constructor and Formatter.formatTime.
Vinay Sajip [Mon, 13 Jun 2011 13:59:36 +0000 (14:59 +0100)]
Closes #12206: documentation update for LogRecord constructor and Formatter.formatTime.

14 years agoallow "fake" filenames in findsource (closes #9284)
Benjamin Peterson [Sat, 11 Jun 2011 20:53:11 +0000 (15:53 -0500)]
allow "fake" filenames in findsource (closes #9284)

This allows findsource() to work in doctests.

A patch from Dirkjan Ochtman.

14 years agoonto 2.7.3
Benjamin Peterson [Sat, 11 Jun 2011 16:33:54 +0000 (11:33 -0500)]
onto 2.7.3

14 years agomerge 2.7.2 release branch
Benjamin Peterson [Sat, 11 Jun 2011 14:51:21 +0000 (09:51 -0500)]
merge 2.7.2 release branch

14 years agoAdded tag v2.7.2 for changeset 8527427914a2
Benjamin Peterson [Sat, 11 Jun 2011 14:50:36 +0000 (09:50 -0500)]
Added tag v2.7.2 for changeset 8527427914a2

14 years agoupdate pydoc-topics v2.7.2
Benjamin Peterson [Sat, 11 Jun 2011 14:50:21 +0000 (09:50 -0500)]
update pydoc-topics

14 years agobump to 2.7.2 final
Benjamin Peterson [Sat, 11 Jun 2011 14:42:44 +0000 (09:42 -0500)]
bump to 2.7.2 final

14 years agomerge heads
Benjamin Peterson [Fri, 10 Jun 2011 16:33:58 +0000 (11:33 -0500)]
merge heads

14 years agomerge 2.7.2 release branch with fix for #12009
Benjamin Peterson [Fri, 10 Jun 2011 16:33:41 +0000 (11:33 -0500)]
merge 2.7.2 release branch with fix for #12009

14 years agofix regression in netrc comment handling (closes #12009)
Benjamin Peterson [Fri, 10 Jun 2011 16:32:52 +0000 (11:32 -0500)]
fix regression in netrc comment handling (closes #12009)

14 years agoIssue #12223: Typo fix in datamodel docs
Eli Bendersky [Fri, 10 Jun 2011 07:36:34 +0000 (10:36 +0300)]
Issue #12223: Typo fix in datamodel docs

14 years ago#10694: zipfile now ignores garbage at the end of a zipfile.
R David Murray [Thu, 9 Jun 2011 20:01:09 +0000 (16:01 -0400)]
#10694: zipfile now ignores garbage at the end of a zipfile.

Original fix by 'rep', final patch (with tests) by Xuanji Li.

14 years agoCorrection to f1509fc75435 - Issue #11583
Brian Curtin [Thu, 9 Jun 2011 15:00:42 +0000 (10:00 -0500)]
Correction to f1509fc75435 - Issue #11583

Rather than wrapping the C _isdir function in a Python function,
just import the C _isdir function directly. Additionally, add in the
docstring which was left out.

14 years agoFix a few misuses of :option: I missed in r86521.
Éric Araujo [Thu, 9 Jun 2011 12:26:10 +0000 (14:26 +0200)]
Fix a few misuses of :option: I missed in r86521.

Extract of the commit message:

  Fix usage of :option: in the docs (#9312).

  :option: is used to create a link to an option of python, not to mark
  up any instance of any arbitrary command-line option.  These were
  changed to ````.

14 years agoBranch merge
Éric Araujo [Thu, 9 Jun 2011 11:14:12 +0000 (13:14 +0200)]
Branch merge

14 years agoMerge
Brian Curtin [Thu, 9 Jun 2011 00:29:53 +0000 (19:29 -0500)]
Merge

14 years agoAdd examples that work on Windows to distutils docs (#1626300)
Éric Araujo [Tue, 7 Jun 2011 23:11:36 +0000 (01:11 +0200)]
Add examples that work on Windows to distutils docs (#1626300)

14 years agoBranch merge
Éric Araujo [Mon, 6 Jun 2011 15:11:31 +0000 (17:11 +0200)]
Branch merge

14 years agomerge 2.7.2 release branch
Benjamin Peterson [Sun, 5 Jun 2011 17:51:18 +0000 (12:51 -0500)]
merge 2.7.2 release branch

14 years agoStop adding txt files twice.
Martin v. Löwis [Sun, 5 Jun 2011 08:44:18 +0000 (10:44 +0200)]
Stop adding txt files twice.

14 years agoAdd 2.7.2 UUIDs
Martin v. Löwis [Sun, 5 Jun 2011 08:43:45 +0000 (10:43 +0200)]
Add 2.7.2 UUIDs

14 years agoRemove unnecessary executable bit on one distutils file
Éric Araujo [Sat, 4 Jun 2011 18:45:33 +0000 (20:45 +0200)]
Remove unnecessary executable bit on one distutils file

14 years agoIssue #12080: Fix a performance issue in Decimal._power_exact that caused some corner...
Mark Dickinson [Sat, 4 Jun 2011 17:24:15 +0000 (18:24 +0100)]
Issue #12080: Fix a performance issue in Decimal._power_exact that caused some corner-case Decimal.__pow__ calls to take an unreasonably long time.

14 years agoRemove outdated bit of advice (c882b5ff92d9 follow-up)
Éric Araujo [Sat, 4 Jun 2011 16:35:04 +0000 (18:35 +0200)]
Remove outdated bit of advice (c882b5ff92d9 follow-up)

14 years agoNull merge from 2.6.
Barry Warsaw [Sat, 4 Jun 2011 00:07:41 +0000 (20:07 -0400)]
Null merge from 2.6.

14 years agoReplay svn r88852.
Barry Warsaw [Sat, 4 Jun 2011 00:05:48 +0000 (20:05 -0400)]
Replay svn r88852.

14 years agoReplay svn r88850. v2.6.7
Barry Warsaw [Sat, 4 Jun 2011 00:02:47 +0000 (20:02 -0400)]
Replay svn r88850.

14 years agoIssue #12016: Add test_errorhandle() to TestBase_Mapping of
Victor Stinner [Fri, 3 Jun 2011 21:56:43 +0000 (23:56 +0200)]
Issue #12016: Add test_errorhandle() to TestBase_Mapping of
test_multibytecodec_support. Improve also error message of the
test_errorhandle() of TestBase.

14 years agoIssue #12016: Reindent decoders of HK and JP codecs
Victor Stinner [Fri, 3 Jun 2011 21:35:27 +0000 (23:35 +0200)]
Issue #12016: Reindent decoders of HK and JP codecs

14 years agomerge 2.7.2 release branch
Benjamin Peterson [Fri, 3 Jun 2011 21:17:48 +0000 (16:17 -0500)]
merge 2.7.2 release branch

14 years agoanother benefit of this change
Benjamin Peterson [Fri, 3 Jun 2011 21:17:22 +0000 (16:17 -0500)]
another benefit of this change

14 years agoDocument working dir for “make html” (#12249). Patch by Tshepang Lekhonkhobe.
Éric Araujo [Fri, 3 Jun 2011 17:25:58 +0000 (19:25 +0200)]
Document working dir for “make html” (#12249).  Patch by Tshepang Lekhonkhobe.

14 years agoFix named tuples to work with vars().
Raymond Hettinger [Fri, 3 Jun 2011 03:40:35 +0000 (20:40 -0700)]
Fix named tuples to work with vars().

14 years agosys.checkinterval() now refreshes the current countdown ticker.
Raymond Hettinger [Thu, 2 Jun 2011 01:21:42 +0000 (18:21 -0700)]
sys.checkinterval() now refreshes the current countdown ticker.

14 years agoCleanup example
Raymond Hettinger [Wed, 1 Jun 2011 23:01:21 +0000 (16:01 -0700)]
Cleanup example

14 years agoMultiple clean-ups to the docs for builtin functions.
Raymond Hettinger [Wed, 1 Jun 2011 22:50:34 +0000 (15:50 -0700)]
Multiple clean-ups to the docs for builtin functions.

* Use concrete example for dir() and eliminate the distracting doctest directives.
* Add a pure python equivalent for enumerate()
* Modify the enumerate() example to demonstrate the start argument
* Remove incorrect reference the *iterable* in the enumerate() docs.
* Downgrade the comments on input() from a warning to a note.
* Fix the iter() example to use the empty string as the terminating
  condition for file.readline().  Also, the old example was broken
  because readline() results include a newline, so 'STOP\n' would have
  been the correct terminating condition.  Even with that fix, the
  STOP example was fragile and would have lead to infinite loops with
  malformed inputs.
* Do not refer to classmethod as being "more advanced" than staticmethod.

14 years agoLink to suggestions for how to use super().
Raymond Hettinger [Wed, 1 Jun 2011 21:57:13 +0000 (14:57 -0700)]
Link to suggestions for how to use super().

14 years agoBranch merge
Éric Araujo [Wed, 1 Jun 2011 17:28:26 +0000 (19:28 +0200)]
Branch merge

14 years agomerge release tag
Benjamin Peterson [Wed, 1 Jun 2011 00:12:11 +0000 (19:12 -0500)]
merge release tag

14 years agomerge heads
Benjamin Peterson [Wed, 1 Jun 2011 00:08:12 +0000 (19:08 -0500)]
merge heads

14 years agomerge 2.7.2 release branch
Benjamin Peterson [Wed, 1 Jun 2011 00:01:23 +0000 (19:01 -0500)]
merge 2.7.2 release branch

14 years agosimply use the Python version for pyexpat.__version__ #12221
Benjamin Peterson [Tue, 31 May 2011 23:59:49 +0000 (18:59 -0500)]
simply use the Python version for pyexpat.__version__ #12221

14 years agoIssue #12085: Fix test_subprocess for my previous commit
Victor Stinner [Tue, 31 May 2011 23:57:48 +0000 (01:57 +0200)]
Issue #12085: Fix test_subprocess for my previous commit

Replace support by test_support, and add captured_stderr() function.

14 years agoadd 2.7.2 header
Benjamin Peterson [Tue, 31 May 2011 23:44:55 +0000 (18:44 -0500)]
add 2.7.2 header

14 years agoClose #12085: Fix an attribute error in subprocess.Popen destructor if the
Victor Stinner [Tue, 31 May 2011 23:03:00 +0000 (01:03 +0200)]
Close #12085: Fix an attribute error in subprocess.Popen destructor if the
constructor has failed, e.g. because of an undeclared keyword argument. Patch
written by Oleg Oshmyan.

14 years agoFix markup: arguments in a class directive are __init__ arguments, not base classes
Éric Araujo [Tue, 31 May 2011 19:50:22 +0000 (21:50 +0200)]
Fix markup: arguments in a class directive are __init__ arguments, not base classes

14 years agoFix error message to use the Python name instead of the C name
Éric Araujo [Tue, 31 May 2011 12:08:40 +0000 (14:08 +0200)]
Fix error message to use the Python name instead of the C name

14 years agoIssue #12057: Add tests for ISO 2022 codecs
Victor Stinner [Mon, 30 May 2011 21:58:21 +0000 (23:58 +0200)]
Issue #12057: Add tests for ISO 2022 codecs

iso2022_jp, iso2022_jp_2 and iso2022_kr

14 years agoIssue #1195: fix the issue number of the NEWS entry
Victor Stinner [Mon, 30 May 2011 21:49:13 +0000 (23:49 +0200)]
Issue #1195: fix the issue number of the NEWS entry

14 years agoIssue #12016: my_fgets() now always clears errors before calling fgets(). Fix
Victor Stinner [Mon, 30 May 2011 21:44:13 +0000 (23:44 +0200)]
Issue #12016: my_fgets() now always clears errors before calling fgets(). Fix
the following case: sys.stdin.read() stopped with CTRL+d (end of file),
raw_input() interrupted by CTRL+c.

14 years agoAdded tag v2.7.2rc1 for changeset f48756685406
Benjamin Peterson [Sun, 29 May 2011 21:50:40 +0000 (16:50 -0500)]
Added tag v2.7.2rc1 for changeset f48756685406

14 years agobump to 2.7.2rc1 v2.7.2rc1
Benjamin Peterson [Sun, 29 May 2011 21:50:27 +0000 (16:50 -0500)]
bump to 2.7.2rc1