Patchwork util: drop remainder of dateutil/procutil aliases (API)

login
register
mail settings
Submitter Yuya Nishihara
Date May 11, 2018, 1:25 p.m.
Message ID <e2effc80f4388b5c9dc7.1526045113@mimosa>
Download mbox | patch
Permalink /patch/31505/
State Accepted
Headers show

Comments

Yuya Nishihara - May 11, 2018, 1:25 p.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1526043206 -32400
#      Fri May 11 21:53:26 2018 +0900
# Node ID e2effc80f4388b5c9dc7effa3bd895350b5cf4ce
# Parent  7932be8b05591c0f80dffb28868afb2812b67169
util: drop remainder of dateutil/procutil aliases (API)
Gregory Szorc - May 12, 2018, 12:08 a.m.
On Fri, May 11, 2018 at 6:25 AM, Yuya Nishihara <yuya@tcha.org> wrote:

> # HG changeset patch
> # User Yuya Nishihara <yuya@tcha.org>
> # Date 1526043206 -32400
> #      Fri May 11 21:53:26 2018 +0900
> # Node ID e2effc80f4388b5c9dc7effa3bd895350b5cf4ce
> # Parent  7932be8b05591c0f80dffb28868afb2812b67169
> util: drop remainder of dateutil/procutil aliases (API)
>
>
Queued, thanks.


> diff --git a/mercurial/util.py b/mercurial/util.py
> --- a/mercurial/util.py
> +++ b/mercurial/util.py
> @@ -47,7 +47,6 @@ from . import (
>      urllibcompat,
>  )
>  from .utils import (
> -    dateutil,
>      procutil,
>      stringutil,
>  )
> @@ -2919,6 +2918,7 @@ def timed(func):
>          finally:
>              elapsed = timer() - start
>              _timenesting[0] -= indent
> +            stderr = procutil.stderr
>              stderr.write('%s%s: %s\n' %
>                           (' ' * _timenesting[0], func.__name__,
>                            timecount(elapsed)))
> @@ -3782,11 +3782,3 @@ def uvarintdecodestream(fh):
>          if not (byte & 0x80):
>              return result
>          shift += 7
> -
> -defaultdateformats = dateutil.defaultdateformats
> -extendeddateformats = dateutil.extendeddateformats
> -
> -stderr = procutil.stderr
> -stdin = procutil.stdin
> -stdout = procutil.stdout
> -closefds = procutil.closefds
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>

Patch

diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -47,7 +47,6 @@  from . import (
     urllibcompat,
 )
 from .utils import (
-    dateutil,
     procutil,
     stringutil,
 )
@@ -2919,6 +2918,7 @@  def timed(func):
         finally:
             elapsed = timer() - start
             _timenesting[0] -= indent
+            stderr = procutil.stderr
             stderr.write('%s%s: %s\n' %
                          (' ' * _timenesting[0], func.__name__,
                           timecount(elapsed)))
@@ -3782,11 +3782,3 @@  def uvarintdecodestream(fh):
         if not (byte & 0x80):
             return result
         shift += 7
-
-defaultdateformats = dateutil.defaultdateformats
-extendeddateformats = dateutil.extendeddateformats
-
-stderr = procutil.stderr
-stdin = procutil.stdin
-stdout = procutil.stdout
-closefds = procutil.closefds