Commit Graph

17757 Commits

Author SHA1 Message Date
Guido van Rossum 28d982dfc5 Also rewrote the guts of asyncio.Semaphore (patch by manipopopo). (Merge 3.4->3.5.) 2015-09-29 12:00:01 -07:00
Guido van Rossum d455a50773 Also rewrote the guts of asyncio.Semaphore (patch by manipopopo). 2015-09-29 11:54:45 -07:00
Eric V. Smith 6dcada3bcf Issue #25034: Merge from 3.5. 2015-09-29 10:30:47 -04:00
Eric V. Smith ad4003c7fb Issue #25034: Merge from 3.4. 2015-09-29 10:30:04 -04:00
Eric V. Smith 85976b14dd Fixed issue #25034: Fix string.Formatter problem with auto-numbering
and nested format_specs. Patch by Anthon van der Neut.
2015-09-29 10:27:38 -04:00
Victor Stinner c3713e9706 Optimize ascii/latin1+surrogateescape encoders
Issue #25227: Optimize ASCII and latin1 encoders with the ``surrogateescape``
error handler: the encoders are now up to 3 times as fast.

Initial patch written by Serhiy Storchaka.
2015-09-29 12:32:13 +02:00
Terry Jan Reedy b1edd5823c merge 3.5 2015-09-29 01:04:08 -04:00
Terry Jan Reedy c69b37ff4e Merge with 3.4 2015-09-29 01:01:00 -04:00
Terry Jan Reedy f38356adbb Remove indent in news item. Error when building 3.x docs. 2015-09-29 01:00:31 -04:00
Terry Jan Reedy e0937ef754 IDLE NEWS. 2015-09-28 23:44:37 -04:00
Terry Jan Reedy 86e971ccb3 IDLE NEWS items. 2015-09-28 23:42:56 -04:00
Terry Jan Reedy 9af7fe76ff Add recent IDLE NEWS items. 2015-09-28 23:38:57 -04:00
Guido van Rossum b4c00154f2 Correct Misc/NEWS about asyncio.Queue rewrite. 2015-09-28 16:53:44 -07:00
Guido van Rossum ab9e936bd9 Correct Misc/NEWS about asyncio.Queue rewrite. 2015-09-28 16:51:59 -07:00
Guido van Rossum 9af30ac669 Correct Misc/NEWS about asyncio.Queue rewrite. 2015-09-28 16:50:38 -07:00
Guido van Rossum d2f184652c Issue #25233: Rewrite the guts of Queue to be more understandable and correct. (Merge 3.4->3.5.) 2015-09-28 07:44:49 -07:00
Guido van Rossum 99f96c5451 Issue #25233: Rewrite the guts of Queue to be more understandable and correct. 2015-09-28 07:42:34 -07:00
Alexander Belopolsky 365ba8f6c1 Closes issue #23600: Wrong results from tzinfo.fromutc(). 2015-09-27 22:32:15 -04:00
Alexander Belopolsky edc6885b3f Closes issue #23600: Wrong results from tzinfo.fromutc(). 2015-09-27 22:31:45 -04:00
Alexander Belopolsky 5d27ed858a merge 2015-09-27 22:13:28 -04:00
Alexander Belopolsky d19b5042ff Closes issue #23600: Wrong results from tzinfo.fromutc(). 2015-09-27 21:56:53 -04:00
Alexander Belopolsky c58c2cb392 Closes issue #23600: Wrong results from tzinfo.fromutc(). 2015-09-27 21:56:09 -04:00
Alexander Belopolsky c79447b267 Closes issue #23600: Wrong results from tzinfo.fromutc(). 2015-09-27 21:41:55 -04:00
Serhiy Storchaka a6c5d53eec Issue #25203: Failed readline.set_completer_delims() no longer left the
module in inconsistent state.
2015-09-27 22:38:33 +03:00
Serhiy Storchaka 36aff2db4a Issue #25203: Failed readline.set_completer_delims() no longer left the
module in inconsistent state.
2015-09-27 22:38:01 +03:00
Serhiy Storchaka 1138439376 Issue #25203: Failed readline.set_completer_delims() no longer left the
module in inconsistent state.
2015-09-27 22:34:59 +03:00
Serhiy Storchaka ab824222d1 Issue #25011: rlcomplete now omits private and special attribute names unless
the prefix starts with underscores.
2015-09-27 13:43:50 +03:00
Serhiy Storchaka 8ace8e99b3 Issue #25209: rlcomplete now can add a space or a colon after completed keyword. 2015-09-27 13:26:03 +03:00
Benjamin Peterson c78f27d239 merge 3.5 (#23329) 2015-09-27 00:09:09 -07:00
Benjamin Peterson d330822c12 detect alpn by feature flag not openssl version (closes #23329) 2015-09-27 00:09:02 -07:00
Raymond Hettinger e055b88937 merge 2015-09-26 00:15:46 -07:00
Raymond Hettinger bf49fee125 Issue #25135: Avoid possible reentrancy issues in deque_clear. 2015-09-26 00:14:59 -07:00
Benjamin Peterson 5b8854eee0 merge 3.5 2015-09-26 00:09:39 -07:00
Benjamin Peterson 03c59b9bef merge 3.4 2015-09-26 00:09:32 -07:00
Benjamin Peterson e48cf7e729 prevent overflow in _Unpickler_Read 2015-09-26 00:08:34 -07:00
Benjamin Peterson 00d4442979 merge 3.5 (#25131) 2015-09-25 22:44:55 -07:00
Benjamin Peterson 58b53953f8 make opening brace of container literals and comprehensions correspond to the line number and col offset of the AST node (closes #25131) 2015-09-25 22:44:43 -07:00
Andrew Svetlov 038b61fbb5 Merge 3.5 -> default 2015-09-24 14:36:00 +03:00
Andrew Svetlov 1c99e529dd Merge 3.4 -> 3.5 2015-09-24 14:35:16 +03:00
Andrew Svetlov 74edd3580e Add Benjamin Hodgson to Misc/ACK 2015-09-24 14:34:07 +03:00
Martin Panter 3766ee5162 Issue #12067: Merge comparisons doc from 3.5 2015-09-23 05:41:52 +00:00
Martin Panter e52c41a714 Issue #12067: Merge comparisons doc from 3.4 into 3.5 2015-09-23 05:34:48 +00:00
Martin Panter aa0da864b8 Issue #12067: Rewrite Comparisons section in the language reference
Some of the details of comparing mixed types were incorrect or ambiguous.
NotImplemented is only relevant at a lower level than the Expressions
chapter. Added details of comparing range() objects, and default behaviour
and consistency suggestions for user-defined classes. Patch from Andy Maier.
2015-09-23 05:28:13 +00:00
Martin Panter f9cd8ff14a Issue #25047: Merge Element Tree encoding from 3.5 2015-09-23 01:49:24 +00:00
Martin Panter 982a08f8bb Issue #25047: Merge Element Tree encoding from 3.4 into 3.5 2015-09-23 01:43:08 +00:00
Steve Dower ebbad80e85 Merge from 3.5 2015-09-22 18:21:13 -07:00
Steve Dower 5f62112db4 Issues #25112: py.exe launcher is missing icons 2015-09-22 18:20:58 -07:00
Martin Panter 89f76d3f91 Issue #25047: Respect case writing XML encoding declarations
This restores the ability to write encoding names in uppercase like "UTF-8",
which worked in Python 2.
2015-09-23 01:14:35 +00:00
Steve Dower 64a3387d69 Issue #19143: platform module now reads Windows version from kernel32.dll to avoid compatibility shims. 2015-09-22 17:29:51 -07:00
Steve Dower a0c3c19665 Issue #19143: platform module now reads Windows version from kernel32.dll to avoid compatibility shims. 2015-09-22 17:24:01 -07:00
Steve Dower b9f4feab1b Issue #19143: platform module now reads Windows version from kernel32.dll to avoid compatibility shims. 2015-09-22 17:23:39 -07:00
Steve Dower 8ef1db34bb Merge with 3.5 2015-09-22 17:01:17 -07:00
Steve Dower a2ea0e4804 Issue #25102: Windows installer does not precompile for -O or -OO. 2015-09-22 16:45:19 -07:00
Steve Dower 44fe401aa3 Issue #25081: Makes Back button in installer go back to upgrade page when upgrading. 2015-09-22 16:36:33 -07:00
Steve Dower 14b9e6c6a7 Issue #25126: Clarifies that the non-web installer will download some components. 2015-09-22 16:36:33 -07:00
Steve Dower bc25032c92 Issue #25091: Increases font size of the installer. 2015-09-22 16:36:29 -07:00
Steve Dower 57ab1cdb15 Issue #25092: Fix datetime.strftime() failure when errno was already set to EINVAL. 2015-09-22 14:51:42 -07:00
Steve Dower 3a0f471e5f Issue #25213: Restores requestedExecutionLevel to manifest to disable UAC virtualization. 2015-09-22 14:33:31 -07:00
Terry Jan Reedy 2b0bf5cce9 Issue #16893: Add idlelib.help.copy_strip() to copy-rstrip Doc/.../idle.html.
Change destination to help.html.  Adjust NEWS entries.
2015-09-21 22:40:31 -04:00
Terry Jan Reedy 5e999fc00a Issue #16893: Add idlelib.help.copy_strip() to copy-rstrip Doc/.../idle.html.
Change destination to help.html.  Adjust NEWS entries.
2015-09-21 22:38:47 -04:00
Terry Jan Reedy cba1a1a000 Issue #16893: Add idlelib.help.copy_strip() to copy-rstrip Doc/.../idle.html.
Change destination to help.html.  Adjust NEWS entries.
2015-09-21 22:36:42 -04:00
Terry Jan Reedy bbde7ad388 Merge with 3.5 2015-09-21 19:33:46 -04:00
Terry Jan Reedy e90bb44347 Marge 3.4 2015-09-21 19:33:14 -04:00
Terry Jan Reedy d9763c2ce4 Issue #24861: add Idle news item and correct previous errors. 2015-09-21 19:28:22 -04:00
Victor Stinner 996572ca3f Merge 3.5 (asyncio) 2015-09-21 18:41:46 +02:00
Victor Stinner 7b58a2bb1d Merge 3.4 (asyncio) 2015-09-21 18:41:05 +02:00
Victor Stinner 5e4a7d8dc7 Issue #23630, asyncio: host parameter of loop.create_server() can now be a
sequence of strings. Patch written by Yann Sionneau.
2015-09-21 18:33:43 +02:00
Terry Jan Reedy 8e5bc98995 Add NEWS items for Idle to 3.6.0a1 section. 2015-09-20 23:32:08 -04:00
Terry Jan Reedy fbcbadbaf3 Merge with 3.5 2015-09-20 23:24:01 -04:00
Terry Jan Reedy c8c5a331ff Add NEWS items for Idle. 2015-09-20 23:23:44 -04:00
Terry Jan Reedy bb5f83f181 Add NEWS items for Idle. 2015-09-20 23:21:22 -04:00
Martin Panter b7d276e647 Issue #25176: Merge cgi.parse_qsl link from 3.5 2015-09-20 01:11:50 +00:00
Martin Panter 926be1b0ec Issue #25176: Merge cgi.parse_qsl link from 3.4 into 3.5 2015-09-20 01:07:41 +00:00
Martin Panter cebfdac32c Issue #25176: Correct link for cgi.parse_qsl; patch from Ville Skyttä 2015-09-20 00:28:50 +00:00
Eric V. Smith 235a6f0984 Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that. 2015-09-19 14:51:32 -04:00
Brett Cannon 36df60fe75 Merge for issue #24915 2015-09-18 15:17:37 -07:00
Brett Cannon 7188a3efe0 Issue #24915: Add Clang support to PGO builds and use the test suite
for profile data.

Thanks to Alecsandru Patrascu of Intel for the initial patch.
2015-09-18 15:13:44 -07:00
Victor Stinner 3abf44e48f Issue #25003: On Solaris 11.3 or newer, os.urandom() now uses the getrandom()
function instead of the getentropy() function. The getentropy() function is
blocking to generate very good quality entropy, os.urandom() doesn't need such
high-quality entropy.
2015-09-18 15:38:37 +02:00
Victor Stinner 258f17c96d Merge 3.5 2015-09-18 15:08:14 +02:00
Victor Stinner 6df29ada02 Issue #25150: Hide the private _Py_atomic_xxx symbols from the public
Python.h header to fix a compilation error with OpenMP. PyThreadState_GET()
becomes an alias to PyThreadState_Get() to avoid ABI incompatibilies.

It is important that the _PyThreadState_Current variable is always accessed
with the same implementation of pyatomic.h. Use the PyThreadState_Get()
function so extension modules will all reuse the same implementation.
2015-09-18 15:06:34 +02:00
Victor Stinner 84ff4abd79 Merge 3.4 (datetime rounding) 2015-09-18 14:50:18 +02:00
Victor Stinner 511491ade0 Issue #23517: Fix rounding in fromtimestamp() and utcfromtimestamp() methods
of datetime.datetime: microseconds are now rounded to nearest with ties going
to nearest even integer (ROUND_HALF_EVEN), instead of being rounding towards
zero (ROUND_DOWN). It's important that these methods use the same rounding
mode than datetime.timedelta to keep the property:

   (datetime(1970,1,1) + timedelta(seconds=t)) == datetime.utcfromtimestamp(t)

It also the rounding mode used by round(float) for example.

Add more unit tests on the rounding mode in test_datetime.
2015-09-18 14:42:05 +02:00
Victor Stinner cdf9b789ee Merge 3.5 (NEWS) 2015-09-18 13:59:30 +02:00
Victor Stinner 02d6a25bea Issue #25155: document the bugfix in Misc/NEWS
Oops, I forgot to document my change.
2015-09-18 13:59:09 +02:00
Serhiy Storchaka 4ebf9d3a21 Issue #25108: Omitted internal frames in traceback functions print_stack(),
format_stack(), and extract_stack() called without arguments.
2015-09-18 10:06:23 +03:00
Serhiy Storchaka e953ba794c Issue #25108: Omitted internal frames in traceback functions print_stack(),
format_stack(), and extract_stack() called without arguments.
2015-09-18 10:04:47 +03:00
Ethan Furman 6db1fd5fb8 Close issue24840: Enum._value_ is queried for bool(); original patch by Mike Lundy 2015-09-17 21:49:12 -07:00
Victor Stinner 024364a89a Merge 3.5 (os.waitpid) 2015-09-15 10:24:27 +02:00
Victor Stinner d3ffd32767 Issue #25118: Fix a regression of Python 3.5.0 in os.waitpid() on Windows.
Add an unit test on os.waitpid()
2015-09-15 10:11:03 +02:00
Larry Hastings d5fd984a60 Merge from 3.5. 2015-09-13 16:57:16 +01:00
Larry Hastings 9c51f89cd6 Merge release engineering work from Python 3.5.0. 2015-09-13 15:43:21 +01:00
Larry Hastings 82c0c69011 Post-release updates for Python 3.5.0. 2015-09-13 15:36:07 +01:00
Larry Hastings f92f6c8e56 Version bump for Python 3.5.0 final. 2015-09-12 17:28:39 +01:00
Larry Hastings fcdd34d263 Regenerate pydoc topics, fix minor non-RST formatting in Misc/NEWS. 2015-09-12 17:24:02 +01:00
Steve Dower a004c54f94 Issue #25071: Windows installer should not require TargetDir parameter when installing quietly 2015-09-11 11:31:07 -07:00
Steve Dower 729aa1462a Adds 3.5.0 header to Misc/NEWS 2015-09-11 11:29:07 -07:00
Steve Dower 6695c2e356 Merge from 3.5.0 2015-09-11 11:27:45 -07:00
Steve Dower 76b7133f58 Issue #25071: Windows installer should not require TargetDir parameter when installing quietly 2015-09-11 10:56:59 -07:00
Victor Stinner e390410ca4 Merge 3.5 2015-09-11 12:38:27 +02:00
Victor Stinner f9fdfa7c4e Merge 3.4 2015-09-11 12:38:17 +02:00
Victor Stinner ec1a498a01 Issue #24684: socket.socket.getaddrinfo() now calls
PyUnicode_AsEncodedString() instead of calling the encode() method of the
host, to handle correctly custom string with an encode() method which doesn't
return a byte string. The encoder of the IDNA codec is now called directly
instead of calling the encode() method of the string.
2015-09-11 12:37:30 +02:00
Martin Panter b26cbf9636 Issue #25030: Merge seek() doc fixes from 3.5 2015-09-11 04:39:42 +00:00
Martin Panter 0e8e78e15d Issue #25030: Merge seek() doc fixes from 3.4 into 3.5 2015-09-11 04:39:31 +00:00
Benjamin Peterson 7920b7063d merge 3.5 (#25060) 2015-09-10 21:11:26 -07:00
Benjamin Peterson b685515039 compute stack effect of BUILD_MAP correctly (closes #25060) 2015-09-10 21:02:39 -07:00
Martin Panter db4220ea09 Issue #25030: Do not document seek() as if it accepts keyword arguments
Patch from Shiyao Ma.
2015-09-11 03:58:30 +00:00
Zachary Ware 5480dea548 Closes #25022 (again): Merge with 3.5 2015-09-10 16:12:48 -05:00
Zachary Ware 31ce9ac867 Issue #25022: Merge with 3.4 2015-09-10 16:08:21 -05:00
Zachary Ware 3d9a9d47a8 Issue #25022: Add NEWS, fix docs to not mention the old example. 2015-09-10 15:50:58 -05:00
Berker Peksag 29bf4d403d Issue #24857: Comparing call_args to a long sequence now correctly returns a
boolean result instead of raising an exception.

Patch by A Kaptur.
2015-09-09 23:39:45 +03:00
Berker Peksag 3fc536f1c9 Issue #24857: Comparing call_args to a long sequence now correctly returns a
boolean result instead of raising an exception.

Patch by A Kaptur.
2015-09-09 23:35:25 +03:00
Berker Peksag 17ebaa93d4 Issue #24857: Comparing call_args to a long sequence now correctly returns a
boolean result instead of raising an exception.

Patch by A Kaptur.
2015-09-09 23:40:11 +03:00
Larry Hastings 334b4a3403 Merge from 3.5. 2015-09-09 07:00:54 -07:00
Larry Hastings ded28e3863 Merge Python 3.5.0rc4 back to hg.python.org. 2015-09-09 06:52:38 -07:00
Larry Hastings 1043f95b9b Version bump for Python 3.5.0rc4. 2015-09-08 23:58:10 -07:00
Martin Panter 98b30cb18a Issue #24984: Merge 3.5 into 3.6 2015-09-09 06:50:07 +00:00
Martin Panter 24a9bd0d39 Issue #24984: Merge 3.4 into 3.5 2015-09-09 06:48:55 +00:00
Martin Panter d1a98587fe Issue #24984: Document AF_BLUETOOTH socket address formats
Patch from Tim Tisdall.
2015-09-09 06:47:58 +00:00
Larry Hastings c31b6d191f Merge 3.5.0rc3 revisions back into current 3.5.0 head. 2015-09-08 22:45:37 -07:00
Steve Dower fcbe1df4af Issue #25027: Reverts partial-static build options and adds vcruntime140.dll to Windows installation. 2015-09-08 21:39:01 -07:00
Steve Dower 0130e2991d Adds Mics/NEWS entry for issue #25029. 2015-09-08 21:27:47 -07:00
Larry Hastings f772e91412 Added Misc/NEWS section for Python 3.5.0 final. 2015-09-08 21:19:48 -07:00
Victor Stinner 7667f58151 Issue #23517: fromtimestamp() and utcfromtimestamp() methods of
datetime.datetime now round microseconds to nearest with ties going to nearest
even integer (ROUND_HALF_EVEN), as round(float), instead of rounding towards
-Infinity (ROUND_FLOOR).

pytime API: replace _PyTime_ROUND_HALF_UP with _PyTime_ROUND_HALF_EVEN. Fix
also _PyTime_Divide() for negative numbers.

_PyTime_AsTimeval_impl() now reuses _PyTime_Divide() instead of reimplementing
rounding modes.
2015-09-09 01:02:23 +02:00
Victor Stinner 69cc487df4 Revert change 0eb8c182131e:
"""Issue #23517: datetime.timedelta constructor now rounds microseconds to
nearest with ties going away from zero (ROUND_HALF_UP), as Python 2 and Python
older than 3.3, instead of rounding to nearest with ties going to nearest even
integer (ROUND_HALF_EVEN)."""

datetime.timedelta uses rounding mode ROUND_HALF_EVEN again.
2015-09-08 23:58:54 +02:00
Serhiy Storchaka 899f32fe1e Issue #24982: shutil.make_archive() with the "zip" format now adds entries
for directories (including empty directories) in ZIP file.
Added test for comparing shutil.make_archive() with the "zip" command.
2015-09-08 05:53:42 +03:00
Serhiy Storchaka d941d7a586 Issue #24982: shutil.make_archive() with the "zip" format now adds entries
for directories (including empty directories) in ZIP file.
Added test for comparing shutil.make_archive() with the "zip" command.
2015-09-08 05:51:00 +03:00
Serhiy Storchaka 2504cecebd Issue #24982: shutil.make_archive() with the "zip" format now adds entries
for directories (including empty directories) in ZIP file.
Added test for comparing shutil.make_archive() with the "zip" command.
2015-09-08 05:47:23 +03:00
Serhiy Storchaka 9df7035f5b Issue #25019: Fixed a crash caused by setting non-string key of expat parser.
Added additional tests for expat parser attributes.
Based on patch by John Leitch.
2015-09-07 22:41:04 +03:00
Serhiy Storchaka 3b1bc7828d Issue #25019: Fixed a crash caused by setting non-string key of expat parser.
Added additional tests for expat parser attributes.
Based on patch by John Leitch.
2015-09-07 22:38:34 +03:00
Serhiy Storchaka 931331a328 Issue #25019: Fixed a crash caused by setting non-string key of expat parser.
Added additional tests for expat parser attributes.
Based on patch by John Leitch.
2015-09-07 22:37:02 +03:00
Serhiy Storchaka 39d6542055 Merge 3.5. 2015-09-07 19:52:12 +03:00
Larry Hastings c8c47f55e6 Merge heads. 2015-09-07 05:16:38 -07:00
Larry Hastings 442c560bd8 Version bump for Python 3.5.0rc3. 2015-09-07 05:12:05 -07:00
Steve Dower 45fd95155f Merge from 3.5 2015-09-06 22:31:26 -07:00
Steve Dower f35bd306ff Merge from 3.5.0 branch. 2015-09-06 22:27:42 -07:00
Steve Dower aa2fcc6b35 Issue #24917: time_strftime() buffer over-read. 2015-09-06 22:18:36 -07:00
Larry Hastings c1635e497d Merged in stevedower/cpython350 (pull request #20)
Issue #25005: Backout fix for #8232 because of use of unsafe subprocess.call(shell=True)
2015-09-06 22:10:22 -07:00
Martin Panter 1b8be1fbe5 Issue #25004: Merge 3.5 into 3.6 2015-09-07 04:07:06 +00:00
Martin Panter da19767b86 Issue #25004: Merge 3.4 into 3.5 2015-09-07 04:04:40 +00:00
Martin Panter e8d58d1f02 Issue #25004: Handle out-of-disk-space error in LargeMmapTests
Patch from John Beck.
2015-09-07 02:57:47 +00:00
Steve Dower e5b5895b5b Issue #24917: time_strftime() buffer over-read. 2015-09-06 19:20:51 -07:00
Martin Panter 3368eb7c25 Issue #23406: Merge 3.5 into 3.6 2015-09-07 02:12:08 +00:00
Martin Panter 06dc2fa3f6 Issue #23406: Merge 3.4 into 3.5 2015-09-07 02:10:59 +00:00
Martin Panter 7f02d6d0d9 Issue #23406: Clarify documentation on multiplying a sequence
Patch from Matheus Vieira Portela.
2015-09-07 02:08:55 +00:00
Ezio Melotti 564cf7b62c #23144: merge with 3.5. 2015-09-06 21:49:48 +03:00
Ezio Melotti 20a2c6482e #23144: merge with 3.4. 2015-09-06 21:44:45 +03:00
Ezio Melotti 6f2bb98966 #23144: Make sure that HTMLParser.feed() returns all the data, even when convert_charrefs is True. 2015-09-06 21:38:06 +03:00
Alexander Belopolsky 7827a5b7c2 Closes Issue#22241: timezone.utc name is now plain 'UTC', not 'UTC-00:00'. 2015-09-06 13:07:21 -04:00
Larry Hastings 714e49371b Issue #24305: Prevent import subsystem stack frames from being counted
by the warnings.warn(stacklevel=) parameter.
2015-09-06 00:39:37 -07:00
Larry Hastings 62b24624dd Backing out 09b62202d9b7; the tests fail on Linux, and it needs a re-think. 2015-09-06 00:31:02 -07:00