Larry Hastings
5c26a8afbb
Version bump for 3.4.1.
2014-05-17 21:46:35 -07:00
Larry Hastings
3a260d228b
Merge.
2014-05-17 21:05:10 -07:00
Jason R. Coombs
09122f84fc
Reindent long line
2014-05-10 13:24:58 -04:00
Jason R. Coombs
0375653371
Replace overly-aggressive comparison for type equality with an isinstance check.
2014-05-10 13:24:18 -04:00
Jason R. Coombs
a384652d6d
Drop support for Python 2.4 in upload command.
2014-05-10 13:22:43 -04:00
Jason R. Coombs
6f71726ecd
Replace import * with explicit import
2014-05-10 13:21:02 -04:00
Jason R. Coombs
7ae0fde001
Clean up style in distutils upload command
2014-05-10 13:20:28 -04:00
doko@ubuntu.com
4ce74dc54c
- Issue #17752 : Fix distutils tests when run from the installed location.
2014-05-07 13:08:51 +02:00
doko@ubuntu.com
e5de66eaa7
- Issue #17752 : Fix distutils tests when run from the installed location.
2014-05-07 12:57:44 +02:00
doko@ubuntu.com
8577e5ae09
- Issue #17752 : Fix distutils tests when run from the installed location.
2014-05-07 04:44:42 +02:00
Larry Hastings
95e0b0d1d0
Version bump for 3.4.1rc1.
2014-05-04 05:06:24 -07:00
Giampaolo Rodola'
4a692ce5ec
Minor cosmetic enhancement to provide a more readable repr()esentation of Extension instances:
...
- <distutils.extension.Extension at 0x2b2088b79b00>
+ <distutils.extension.Extension('_struct') at 0x2b2088b79b00>
2014-03-27 14:14:16 +01:00
Victor Stinner
a69f0f94d3
(Merge 3.4) Issue #20978 : pyflakes: fix undefined names; remove last part of
...
OS/2 support in distutils
2014-03-20 08:51:24 +01:00
Victor Stinner
790bd6dd13
Issue #20978 : Remove last part of OS/2 support in distutils
2014-03-20 08:50:33 +01:00
Larry Hastings
f5002bd6ac
Version bump to 3.5, step 2.
2014-03-16 23:05:59 -07:00
Larry Hastings
3c5c56f3c0
Merged default into 3.4 branch. 3.4 branch is now effectively 3.4.1rc1.
2014-03-16 22:54:05 -07:00
Larry Hastings
cf1a3cd2c7
Release bump for 3.4.0 final.
2014-03-15 22:34:24 -07:00
Éric Araujo
45fc8713bd
Make distutils error messages more helpful ( #11599 ).
...
When running external programs such as a C compiler and getting an
error code, distutils only prints the program name. With this change,
one can get the full command line by setting the DISTUTILS_DEBUG
environment variable.
This should have no compatibility issues, unless there are tools
that depend on the exact format of distutils debug messages.
2014-03-13 04:55:35 -04:00
Éric Araujo
f1e8c70cf0
Merge 3.3 ( #11599 )
2014-03-13 05:59:31 -04:00
Éric Araujo
a0fe1f74f9
Merge 3.3 ( #4931 )
2014-03-12 04:10:51 -04:00
Éric Araujo
fc773a2d4b
Avoid “error: None” messages from distutils ( #4931 ).
...
Thanks to Amaury Forgeot d’Arc and Philip J. Eby.
2014-03-12 03:34:02 -04:00
Georg Brandl
fbd7518a41
Bump to 3.3.5 final.
2014-03-09 09:37:14 +01:00
Larry Hastings
d5c59763ad
Version bump for 3.4.0rc3.
2014-03-09 04:13:05 -07:00
Georg Brandl
c186b23799
Bump to 3.3.5rc2.
2014-03-02 09:19:03 +01:00
Georg Brandl
e12675a0f2
Bump to 3.3.5rc1.
2014-02-23 08:30:06 +01:00
Larry Hastings
e9f73ac1fd
Python 3.4.0rc1: Version bump.
2014-02-10 14:45:05 -08:00
Georg Brandl
8f9c20b8ff
merge with 3.3.4 releasing repo
2014-02-10 22:04:20 +01:00
Larry Hastings
f34177a6f9
Version bump for Python 3.4.0rc2.
2014-02-23 02:18:24 -06:00
Serhiy Storchaka
a26b3f183d
Issue #20363 . Fixed BytesWarning triggerred by test suite.
...
Patch by Berker Peksag.
2014-02-06 22:52:23 +02:00
Serhiy Storchaka
bc27a050a7
Issue #20363 . Fixed BytesWarning triggerred by test suite.
...
Patch by Berker Peksag.
2014-02-06 22:49:45 +02:00
Georg Brandl
c81402527a
Bump to 3.3.4 final
2014-02-09 08:43:05 +01:00
Stefan Krah
748f40d162
Issue #9709 : Revert 97fb852c5c26. Many extensions are not using PyMODINIT_FUNC.
2014-01-28 15:04:40 +01:00
Larry Hastings
2d8e1e4f07
Version bump for 3.4.0b3.
2014-01-26 00:48:23 -08:00
Georg Brandl
18f2ce9e7d
Bump to 3.3.4rc1.
2014-01-25 09:19:50 +01:00
Larry Hastings
a6c55232ab
Bump version number for 3.4.0b2.
2014-01-05 04:40:25 -08:00
Zachary Ware
bfd488c51f
Issue #19544 , #6516 : check ZLIB_SUPPORT, not zlib (which might not be bound)
2013-12-30 15:09:20 -06:00
Zachary Ware
2ee2c95595
Issue #19544 , #6516 : check ZLIB_SUPPORT, not zlib (which might not be bound)
2013-12-30 14:39:46 -06:00
Antoine Pitrou
5bf8c3477d
Fix bootstrap issue by importing the cgi module lazily
2013-12-22 19:41:31 +01:00
Antoine Pitrou
e62a40401d
Fix bootstrap issue by importing the cgi module lazily
2013-12-22 19:37:17 +01:00
Antoine Pitrou
20d5adea6a
Fix TypeError on "setup.py upload --show-response".
2013-12-22 18:14:56 +01:00
Antoine Pitrou
335a5128e5
Fix TypeError on "setup.py upload --show-response".
2013-12-22 18:13:51 +01:00
Antoine Pitrou
e8d07a9885
Issue #12226 : HTTPS is now used by default when connecting to PyPI.
2013-12-22 01:45:42 +01:00
Antoine Pitrou
f60b7df9f8
Issue #12226 : HTTPS is now used by default when connecting to PyPI.
2013-12-22 01:35:53 +01:00
Antoine Pitrou
23b8cd963d
Fix urllib.request.build_opener mocking in test_distutils (should fix some random buildbot failures)
2013-12-22 00:44:28 +01:00
Antoine Pitrou
6783487757
Fix urllib.request.build_opener mocking in test_distutils (should fix some random buildbot failures)
2013-12-22 00:44:01 +01:00
Antoine Pitrou
29fd05f900
Issue #20045 : Fix "setup.py register --list-classifiers".
2013-12-21 22:59:06 +01:00
Antoine Pitrou
716b7222e9
Issue #20045 : Fix "setup.py register --list-classifiers".
2013-12-21 22:57:56 +01:00
Antoine Pitrou
492b9893e1
Fix DeprecationWarnings in test suite
2013-12-21 22:19:46 +01:00
Serhiy Storchaka
3f5f436680
Issue #19492 : Silently skipped distutils tests now reported as skipped.
2013-12-18 16:45:24 +02:00
Serhiy Storchaka
3c02ecefba
Issue #19492 : Silently skipped distutils tests now reported as skipped.
2013-12-18 16:41:01 +02:00
Stefan Krah
5aa08ca375
Issue #9709 : Stop adding PyInit_" + module_name' to export_symbols. This is
...
already done by PyMODINIT_FUNC.
2013-12-03 13:55:20 +01:00
Serhiy Storchaka
eaec3597dd
Issue #19760 : Silence sysconfig's 'SO' key deprecation warnings in tests.
...
Change stacklevel in warnings.warn() for 'SO' key to 2.
2013-11-26 17:08:24 +02:00
Larry Hastings
7e611dab4a
Bump version number to 3.4.0b1.
2013-11-24 06:59:35 -08:00
Barry Warsaw
9121f8d94b
Issue 19555 for distutils, plus a little clean up (pyflakes, line lengths).
2013-11-22 15:31:35 -05:00
Georg Brandl
497b3943a3
merge with 3.3.3 release clone
2013-11-17 09:17:18 +01:00
Georg Brandl
9e2043a561
Bump to 3.3.3 final.
2013-11-17 07:58:22 +01:00
Serhiy Storchaka
932c6160b5
Issue #19600 : Use specific asserts in distutils tests.
2013-11-17 00:20:12 +02:00
Serhiy Storchaka
39989157ad
Issue #19600 : Use specific asserts in distutils tests.
2013-11-17 00:17:46 +02:00
Jason R. Coombs
b41c2547e0
Correct long line
2013-11-16 10:47:17 -05:00
Jason R. Coombs
9d78e416f5
Issue #19586 : Update remaining deprecated assertions to their preferred usage.
2013-11-16 10:35:46 -05:00
Jason R. Coombs
6f87a08aa7
Update more usage of assertEqual
2013-11-15 19:41:57 -05:00
Jason R. Coombs
e9f0311a0f
Use preferred assertEqual
2013-11-15 19:38:51 -05:00
Jason R. Coombs
75c40aed55
Use preferred assertEqual form. Correct indentation.
2013-11-15 19:35:05 -05:00
Jason R. Coombs
cb37641bb4
Issue #7408 : Forward port limited test from Python 2.7, fixing failing buildbot tests on BSD-based platforms.
2013-11-15 19:24:07 -05:00
Georg Brandl
4cf9b2047d
Bump to 3.3.3rc2.
2013-11-11 06:13:54 +01:00
Jason R. Coombs
a2ebfd0256
Issue #19544 and Issue #6286 : Restore use of urllib over http allowing use of http_proxy for Distutils upload command, a feature accidentally lost in the rollback of distutils2.
2013-11-10 18:50:10 -05:00
Jason R. Coombs
3492e39b44
Issue 19544 and Issue #7457 : Restore the read_pkg_file method to distutils.dist.DistributionMetadata accidentally removed in the undo of distutils2.
2013-11-10 18:15:03 -05:00
Andrew Kuchling
2a1838b9df
Issue #19544 and Issue #1180 : Restore global option to ignore ~/.pydistutils.cfg in Distutils, accidentally removed in backout of distutils2 changes.
2013-11-10 18:11:00 -05:00
Victor Stinner
aa32779632
Issue #19544 , #6516 : no need to catch AttributeError on import pwd/grp
2013-11-15 23:13:17 +01:00
Christian Heimes
06afed07d1
Issue #19544 and Issue #6516 : quick workaround for failing builds
2013-11-15 23:08:21 +01:00
Andrew Kuchling
5e2d45672c
Issue #19544 and Issue #6516 : Restore support for --user and --group parameters to sdist command as found in Python 2.7 and originally slated for Python 3.2 but accidentally rolled back as part of the distutils2 rollback. Closes Issue #6516 .
2013-11-15 13:01:52 -05:00
Jason R. Coombs
77796e4f7a
Fix failing test incorrectly merged in b1244046f37a
2013-11-10 20:28:18 -05:00
Jason R. Coombs
0048ae0cc6
Merge with 3.3 for Issue #19544 and Issue #6286 . Merge is untested. I was unable to test due to bab0cbf86835.
2013-11-10 18:59:44 -05:00
Jason R. Coombs
375dc9b8b4
Merge with 3.3 for Issue #19544 and Issue #7457
2013-11-10 18:21:49 -05:00
Georg Brandl
7b5d6adb28
Backout 265d369ad3b9.
2013-11-04 07:43:41 +01:00
Georg Brandl
7ec3e56bb8
Backout d80207d15294.
2013-11-04 07:43:32 +01:00
Jason R. Coombs
e71fb28519
Merge with 3.3 for Issue #19286 .
2013-11-02 13:04:51 -04:00
Jason R. Coombs
ca9242f4f9
Merge with 3.2 for Issue #19286 .
2013-11-02 13:01:46 -04:00
Jason R. Coombs
bd26d86d74
Issue #19286 : [distutils] Only match files in build_py.find_data_files.
2013-11-02 11:07:35 -04:00
Jason R. Coombs
93912b9e54
Issue #19286 : Adding test demonstrating the failure when a directory is found in the package_data globs.
2013-11-02 11:29:33 -04:00
Georg Brandl
2d34f41bee
Bump to 3.3.3rc1.
2013-10-27 09:22:59 +01:00
Larry Hastings
bd61c3ae1f
Version bump for 3.4.0a4.
2013-10-20 02:01:29 -07:00
Antoine Pitrou
6a9c0e50a9
Issue #12641 : Avoid passing "-mno-cygwin" to the mingw32 compiler, except when necessary.
...
Patch by Oscar Benjamin.
2013-09-30 22:29:48 +02:00
Antoine Pitrou
3c678c33a7
Issue #12641 : Avoid passing "-mno-cygwin" to the mingw32 compiler, except when necessary.
...
Patch by Oscar Benjamin.
2013-09-30 22:28:10 +02:00
Larry Hastings
d92af0f1d9
Merge 3.4.0a3 release changes.
2013-09-30 01:13:32 +01:00
Benjamin Peterson
5395d211f9
merge 3.3 ( #19114 )
2013-09-29 11:13:50 -04:00
Benjamin Peterson
56b143d758
condense two tests with the same name ( closes #19114 )
2013-09-29 11:13:27 -04:00
Antoine Pitrou
61e10a5efe
Issue #4366 : Fix building extensions on all platforms when --enable-shared is used.
2013-09-29 01:49:07 +02:00
Antoine Pitrou
643238eb53
Issue #4366 : Fix building extensions on all platforms when --enable-shared is used.
2013-09-29 01:48:40 +02:00
Larry Hastings
44719a7717
Version bump to 3.4.0a3.
2013-09-28 23:51:00 +01:00
Larry Hastings
3a2d18b7d7
Version number bump for Python 3.4.0a2.
2013-09-07 23:42:07 +12:00
Ezio Melotti
e0c69161bc
#18741 : merge with 3.3.
2013-08-17 16:13:22 +03:00
Ezio Melotti
b5bc353b88
#18741 : fix more typos. Patch by Févry Thibault.
2013-08-17 16:11:40 +03:00
Larry Hastings
1f08c772f5
Bumped version to 3.4.0a1.
2013-08-03 12:58:12 -07:00
Brett Cannon
cd171c8e92
Issue #18200 : Back out usage of ModuleNotFoundError (8d28d44f3a9a)
2013-07-04 17:43:24 -04:00
Brett Cannon
61c3556c14
Issue #17177 : Stop using imp in distutils
2013-06-15 12:59:53 -04:00
Brett Cannon
0a140668fa
Issue #18200 : Update the stdlib (except tests) to use
...
ModuleNotFoundError.
2013-06-13 20:57:26 -04:00
Ned Deily
97345680dc
Issue #18080 : When building a C extension module on OS X, if the compiler
...
is overriden with the CC environment variable, use the new compiler as
the default for linking if LDSHARED is not also overriden. This restores
Distutils behavior introduced in 3.2.3 and inadvertently dropped in 3.3.0.
2013-05-28 16:35:30 -07:00
Ned Deily
6750282007
Issue #18080 : merge from 3.3
2013-05-28 16:45:06 -07:00
Georg Brandl
88f4dd6451
bump to 3.3.2
2013-05-12 12:51:38 +02:00
Georg Brandl
7025349aa8
merge with 3.3
2013-05-12 12:37:12 +02:00
Georg Brandl
521ed52131
Closes issue #17732 : ignore install-directory specific options in
...
distutils.cfg when a venv is active.
2013-05-12 12:36:07 +02:00
Georg Brandl
bfe36ec1f5
Bump to version 3.2.5.
2013-05-12 12:28:20 +02:00
Ezio Melotti
f7520dc0d7
Fix uploadTestCase to work even when HTTPSConnection is not available.
2013-04-19 04:23:09 +03:00
Georg Brandl
9aa23c5671
Bump to 3.3.1.
2013-04-06 09:40:02 +02:00
Georg Brandl
8bc7e31529
Bump to 3.2.4.
2013-04-06 09:36:20 +02:00
Georg Brandl
d08d0b1c69
Bump to 3.3.1rc1.
2013-03-23 16:05:12 +01:00
Georg Brandl
b673d99698
Bump to 3.2.4rc1.
2013-03-23 16:02:08 +01:00
doko@ubuntu.com
6d3d0fe0b2
- Issue #16754 : Fix the incorrect shared library extension on linux. Introduce
...
two makefile macros SHLIB_SUFFIX and EXT_SUFFIX. SO now has the value of
SHLIB_SUFFIX again (as in 2.x and 3.1). The SO macro is removed in 3.4.
2013-03-21 13:39:52 -07:00
doko@ubuntu.com
1621d77fc8
- Issue #16754 : Fix the incorrect shared library extension on linux. Introduce
...
two makefile macros SHLIB_SUFFIX and EXT_SUFFIX. SO now has the value of
SHLIB_SUFFIX again (as in 2.x and 3.1). The SO macro is removed in 3.4.
2013-03-21 13:31:41 -07:00
doko@ubuntu.com
d5537d071c
- Issue #16754 : Fix the incorrect shared library extension on linux. Introduce
...
two makefile macros SHLIB_SUFFIX and EXT_SUFFIX. SO now has the value of
SHLIB_SUFFIX again (as in 2.x and 3.1). The SO macro is removed in 3.4.
2013-03-21 13:21:49 -07:00
Benjamin Peterson
45c9704b73
use the HTTPS for pypi upload
2013-03-18 15:20:56 -07:00
Ezio Melotti
469da97c1e
#11420 : merge with 3.3.
2013-03-16 21:50:04 +02:00
Ezio Melotti
e5e7a7cbf4
#11420 : merge with 3.2.
2013-03-16 21:49:20 +02:00
Ezio Melotti
c28f6fa505
#11420 : make test suite pass with -B/DONTWRITEBYTECODE set. Initial patch by Thomas Wouters.
2013-03-16 19:48:51 +02:00
Terry Jan Reedy
16b5c13668
Merge 3.3, issue #17047 : remove doubled words found in 2.7 to
...
3.4 Lib/*, as reported by Serhiy Storchaka and Matthew Barnett.
2013-03-11 17:59:07 -04:00
Terry Jan Reedy
98472b8396
Merge 3.2, issue #17047 : remove doubled words found in 2.7 to
...
3.4 Lib/*, as reported by Serhiy Storchaka and Matthew Barnett.
2013-03-11 17:58:27 -04:00
Terry Jan Reedy
c30b7b16ea
Issue #17047 : remove doubled words found in 2.7 to 3.4 Lib/*,
...
as reported by Serhiy Storchaka and Matthew Barnett.
2013-03-11 17:57:08 -04:00
Serhiy Storchaka
f011881d7d
Issue #17041 : Fix testing when Python is configured with the
...
--without-doc-strings.
2013-01-27 20:04:26 +02:00
Serhiy Storchaka
26f1166510
Issue #17041 : Fix testing when Python is configured with the
...
--without-doc-strings.
2013-01-27 20:03:39 +02:00
Serhiy Storchaka
9d0add0c7e
Issue #17041 : Fix testing when Python is configured with the
...
--without-doc-strings.
2013-01-27 19:47:45 +02:00
doko@python.org
981eec3ad4
- Issue #15484 : Fix _PYTHON_PROJECT_BASE for srcdir != builddir builds;
...
use _PYTHON_PROJECT_BASE in distutils/sysconfig.py.
2013-01-25 14:35:44 +01:00
doko@python.org
9731330d6f
- Issue #15484 : Fix _PYTHON_PROJECT_BASE for srcdir != builddir builds;
...
use _PYTHON_PROJECT_BASE in distutils/sysconfig.py.
2013-01-25 14:33:33 +01:00
Andrew Svetlov
f7a17b48d7
Replace IOError with OSError ( #16715 )
2012-12-25 16:47:37 +02:00
Andrew Svetlov
0832af6628
Issue #16717 : get rid of socket.error, replace with OSError
2012-12-18 23:10:48 +02:00
Andrew Svetlov
ad28c7f9da
Issue #16706 : get rid of os.error
2012-12-18 22:02:39 +02:00
Andrew Svetlov
a191959849
Issue #16714 : use 'raise' exceptions, don't 'throw'.
...
Patch by Serhiy Storchaka.
2012-12-18 21:27:16 +02:00
Andrew Svetlov
5b89840d9c
Issue #16714 : use 'raise' exceptions, don't 'throw'.
...
Patch by Serhiy Storchaka.
2012-12-18 21:26:36 +02:00
Andrew Svetlov
737fb89dd1
Issue #16714 : use 'raise' exceptions, don't 'throw'.
...
Patch by Serhiy Storchaka.
2012-12-18 21:14:22 +02:00
Éric Araujo
bb7da03f6e
Merge fixes for #13614 , #13512 and #7719 from 3.3
2012-12-08 22:57:08 -05:00
Éric Araujo
3f7c0e4036
Merge fixes for #13614 , #13512 and #7719 from 3.2
2012-12-08 22:53:43 -05:00
Éric Araujo
8b503c0a4e
Fix setup.py register failure with invalid rst in description ( #13614 ).
...
Original patch by Julien Courteau and Pierre Paul Lefebvre.
2012-12-08 22:41:11 -05:00
Éric Araujo
d61926e6be
Create ~/.pypirc securely ( #13512 ).
...
There was a window between the write and the chmod where the user’s
password would be exposed, depending on default permissions. Philip
Jenvey’s patch fixes it.
2012-12-08 14:51:47 -05:00
Éric Araujo
3e4a3dcb23
Ignore .nfs* files in distutils ( #7719 ).
...
These files are created by some NFS clients a file is edited and removed
concurrently (see added link in doc for more info). If such a file is
removed between distutils calls listdir and copy, it will get confused.
Other special files are ignored in sdist (namely VCS directories), but
this has to be filtered out earlier.
2012-12-08 14:21:51 -05:00
Vinay Sajip
998b105c68
Closes #16116 : Merged fix from 3.3.
2012-10-23 20:27:43 +01:00
Vinay Sajip
e87acc1f38
Issue #16116 : Now uses corrected include and library paths when building C extensions in a venv.
2012-10-23 20:26:14 +01:00
Jesus Cea
d17833d360
Closes #16135 : Removal of OS/2 support (distutils)
2012-10-11 01:20:12 +02:00
Georg Brandl
08a9012352
Bump version to 3.4.0 alpha 0.
2012-09-29 09:34:13 +02:00
Georg Brandl
c7dcd50e4e
Bump version to 3.3.0 final.
2012-09-29 09:04:54 +02:00
Georg Brandl
8506d3591c
Bump to 3.3.0rc3.
2012-09-23 17:15:21 +02:00
Georg Brandl
02f66cbe87
Bump to 3.3.0rc2.
2012-09-09 08:56:46 +02:00
Georg Brandl
4ab4ec258c
Bump to 3.3.0rc1.
2012-08-25 12:16:37 +02:00
Georg Brandl
1b94ab79a9
Bump to 3.3b2.
2012-08-11 08:49:20 +02:00
Ned Deily
6c779ea553
Issue #15364 : Fix test_srcdir for the installed case.
2012-07-27 23:37:04 -07:00
Richard Oudkerk
46874ad367
Issue #15364 : Fix sysconfig.get_config_var('srcdir') to be an absolute path.
2012-07-27 12:06:55 +01:00
Ned Deily
c7a5a76b1e
Issue #15184 : Some config variables in test_sysconfig_module
...
may differ between sysconfig and distutils.sysconfig due to
compiler customizations on OS X. For now, move those vars
into a separate test and skip if the customization has taken
place in distutils. The long-term solution is to eliminate
having two sysconfig modules.
2012-07-22 02:56:36 -07:00
Ned Deily
df8aa2b325
Issue #15184 : Ensure consistent results of OS X configuration
...
tailoring for universal builds by factoring out common OS X-specific
customizations from sysconfig, distutils.sysconfig, distutils.util,
and distutils.unixccompiler into a new module _osx_support that can
eventually also be used by packaging.
2012-07-21 05:36:30 -07:00
Vinay Sajip
8cffdd9ca2
Closes #15367 : Corrected computation of include locations for source builds on Windows. Thanks to Richard Oudkerk for the bug report and patch.
2012-07-16 18:30:03 +01:00
Vinay Sajip
048b063780
Closes #15366 : Corrected computation of include location for source builds. Thanks to Richard Oudkerk for the bug report and patch.
2012-07-16 18:24:55 +01:00
Ned Deily
274717757d
Issue #13590 : Improve support for OS X Xcode 4:
...
- fix test_distutils and test_sysconfig test failures by
aligning sysconfig and distutils.sysconfig tailoring of
configure variables (as in 2.7)
2012-07-15 21:30:03 -07:00