Submitter | Jun Wu |
---|---|
Date | May 9, 2017, 1:07 a.m. |
Message ID | <ad8cf58a8ba5bf96e602.1494292047@x1c> |
Download | mbox | patch |
Permalink | /patch/20536/ |
State | Superseded |
Headers | show
Return-Path: <mercurial-devel-bounces@mercurial-scm.org> X-Original-To: patchwork@mercurial-scm.org Delivered-To: patchwork@mercurial-scm.org Received: from localhost (localhost [127.0.0.1]) by mercurial-scm.org (Postfix) with ESMTP id BE1C52C26E; Mon, 8 May 2017 21:07:54 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at mercurial-scm.org Received: from mercurial-scm.org ([127.0.0.1]) by localhost (mercurial-scm.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id zJJzYltJOhmi; Mon, 8 May 2017 21:07:54 -0400 (EDT) Received: from mercurial-scm.org (localhost [IPv6:::1]) by mercurial-scm.org (Postfix) with ESMTP id D4F772C27E; Mon, 8 May 2017 21:07:44 -0400 (EDT) X-Original-To: mercurial-devel@mercurial-scm.org Delivered-To: mercurial-devel@mercurial-scm.org Received: from localhost (localhost [127.0.0.1]) by mercurial-scm.org (Postfix) with ESMTP id 135532C1C8 for <mercurial-devel@mercurial-scm.org>; Mon, 8 May 2017 21:07:43 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at mercurial-scm.org Received: from mercurial-scm.org ([127.0.0.1]) by localhost (mercurial-scm.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id koWYONSRK1vH for <mercurial-devel@mercurial-scm.org>; Mon, 8 May 2017 21:07:42 -0400 (EDT) Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by mercurial-scm.org (Postfix) with ESMTPS id C98A52C212 for <mercurial-devel@mercurial-scm.org>; Mon, 8 May 2017 21:07:38 -0400 (EDT) Received: from pps.filterd (m0044010.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v490sSZh017740 for <mercurial-devel@mercurial-scm.org>; Mon, 8 May 2017 18:07:38 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=content-type : mime-version : content-transfer-encoding : subject : message-id : in-reply-to : references : date : from : to; s=facebook; bh=86zwqMRyR3iyyfUcCX380PJ7Eb1b/rWmiuPDFVuHYY0=; b=C+rmMqyKbcVAJiGwUX68hsbRmRYxZvMV1vx7yMD+j5etu/0zsQl5w25O1aeBznUXV61f 2cht30GKBNdASW6Vtddl8SxnTuxdIdgV7Ja/jfKqP21PhdAscNYCQbZdVruIbEuqHxZE EvZW+D1MVbVBSf6fVPgjuxlyJeDR0lsMj7c= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 2ab302g48u-2 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for <mercurial-devel@mercurial-scm.org>; Mon, 08 May 2017 18:07:38 -0700 Received: from NAM03-BY2-obe.outbound.protection.outlook.com (192.168.54.28) by o365-in.thefacebook.com (192.168.16.16) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 8 May 2017 18:07:37 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.onmicrosoft.com; s=selector1-fb-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=86zwqMRyR3iyyfUcCX380PJ7Eb1b/rWmiuPDFVuHYY0=; b=dOVv6uLBA2qGUQh+IsUn8qMr6qbjzzNI1FJluc9SxOO+EXZGVckXQxC/uys4jfQ68wbxNQCNspSyQUNEcoKNAPrD5AhStHZyxoFuZNZ4K08rNv3osytVVIPh4oThbH8HX4ubyA9zDh5mDBuhVp7bITIBNQHxgfXFIjuKcNFXXNw= Authentication-Results: mercurial-scm.org; dkim=none (message not signed) header.d=none; mercurial-scm.org; dmarc=none action=none header.from=fb.com; Received: from [127.0.0.1] (199.201.64.130) by BN6PR15MB1508.namprd15.prod.outlook.com (10.172.151.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1061.12; Tue, 9 May 2017 01:07:35 +0000 MIME-Version: 1.0 Subject: [PATCH 6 of 7] osutil: use PYMODULEINIT X-Mercurial-Node: ad8cf58a8ba5bf96e6020eb88560c283eb7463c6 X-Mercurial-Series-Index: 6 X-Mercurial-Series-Total: 7 Message-ID: <ad8cf58a8ba5bf96e602.1494292047@x1c> X-Mercurial-Series-Id: <a2c5e183cafca6d58a0d.1494292042@x1c> In-Reply-To: <a2c5e183cafca6d58a0d.1494292042@x1c> References: <a2c5e183cafca6d58a0d.1494292042@x1c> User-Agent: Mercurial-patchbomb/4.2+13-7d3535d27798 Date: Mon, 8 May 2017 18:07:27 -0700 From: Jun Wu <quark@fb.com> To: <mercurial-devel@mercurial-scm.org> X-Originating-IP: [199.201.64.130] X-ClientProxiedBy: DM5PR1101CA0008.namprd11.prod.outlook.com (10.174.246.18) To BN6PR15MB1508.namprd15.prod.outlook.com (10.172.151.148) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 98e1e0f0-636f-454e-d90f-08d49677c786 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:BN6PR15MB1508; X-Microsoft-Exchange-Diagnostics: 1; BN6PR15MB1508; 3:NobrkDbOZjSworvCxqcnRR0WjAs/k8DZZUQBShZVMHMu4iE//Q4Xnilm4UAzUld1cPftvVh395YMAVQ/B5F4p+H6ZROJtKd+BYFmW3VTD+1nIPR1kD+DpilPGkQ1YrbyLAW3JahyjjFioM5kKJAYD38D0NxE5ioz6YSznykgIsYd3RDWFpUK9EWPtrOAexdriNvzNrFVWsIBTbO5U6YrNQbmxaVFNmo9lYU2McWYmD/64Pv0z9xvtmm9ysdfpN9R3C+HrTwJY+aGnxbdDGba4U09pzrax1OrntX5YfXZwf1UnOhsH1OOU1zHtYhDoESY/Rrn1CFgLjStmIXz5axlSg==; 25:k8Bg9JiVAUL65fPw7aAg4OGfjZWwStQtm1MWq/O3yW6ZJ+CJaODxN1DkyYWW9Aal1BeKPGfUjJQCzfOfmpg864dbA5nNCl3nxtgREaPHbDik/UG5DW8oGQYBcOU15TcXhUi0FmpSG86ZcD53dw79Xq75L5/vN2M5FvLpgWI41uLBq+6dotgNmu2K5F0wSUZtoUoxcJ3kWLvauUV1G8IgehBAYAFG7f/LrYtp9MUgv0/ihentamgSm5S+CkG5XZ3PsHvbt93HUd+qpmYy/tmfU4Lz6W2uXTP7egfpRH0rDOw7YD+rRqGKAg3vHBwOhrgG+1Bd8MDZCXo+FKw+S05u0muWXeH/4OCONNnF8ddn1L0eqwI9lAUUO2k6oRK17PEuP9Uajf+Y3J2DrNuMn/fHhIRL62ydmvFW0iBDRjOTi/NdBvBshvRCdUxaDjSIWVlfoSpWhfOnrn92HUW2g4Ts0w== X-Microsoft-Exchange-Diagnostics: 1; BN6PR15MB1508; 31:30I48vE6xTJWXp/DRbxFyEC/UHhnhjW3b4MKmiVNu2s/x/nLSlgBN5rE3vwGGl6c6vp5keP7J8vaASbl+zA6/4Tt5JakwkCDUrikEpQARbzVudCCOtZI9ZUxw5oXOs0MMB0N58lvLLvHxxeKjS6oQ2vX417GcKslQl7MrErByW8b+nSg3lciFqhr2mRvZ14KQAbnab5zSHyuIm2vSQfGskLYIhr76tflQOQ3aqlc/PSoHsgZk8gZHcuMYlk49z89U9MxuNgMS/MH+mnTwP9bcA==; 20:NQ7OQ2I5tPS7miPzTmKHUMQJ472QImwzFyGi+keQo7hungm1nNCeL2MheFLGBnqdphx50UNmXJH+5MKWehBJwWcNuQsRae6JhiCucZ/wz9U4JTeZ4sft8LrJF3mpuVTcrcyvZ6YQxVUEEUyKnTOh04ffT8j56iSNTeq564N/ibQLS9h9/+U+Ff3AK/fvNcDtsmVjZlaJCwxtLaAMD/DSpJchoJiF8h5g6anaHwNyJNsI3V26aJHrww+LJkFl7hhzZE0vy31MSobMDCZUVBaIP+O/GYWCpxQk0LAA2zktXPZfShoP8tuezsIRXmXSUTb3BWiehgiiohxMCRTjwAJ8z+1o/5dCujFyET/TepORu4Rp5XmbOv4ZU1jbMEWGoEnMRfrSycwcGA77NtnaWtkTb89w2kw3wAbR3WT8q/m/6vEXFO0DDWIh34abPuqymVcC1FSdwUgvZqj54k9pngjadsisxcL0HUaxwzOJAdMsOJWcRxDpjPFkPl7F4M6NDtV5 X-Microsoft-Antispam-PRVS: <BN6PR15MB1508706DB699B7FDCD2DA089CDEF0@BN6PR15MB1508.namprd15.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(67672495146484)(63843785518722); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93001095)(6041248)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123555025)(20161123562025)(20161123560025)(6072148); SRVR:BN6PR15MB1508; BCL:0; PCL:0; RULEID:; SRVR:BN6PR15MB1508; X-Microsoft-Exchange-Diagnostics: 1; BN6PR15MB1508; 4:3b5M3QOfSMY7j6l5NiCu5WFAPBfAfyN8PeExOy1LZC0Dsjc942sXJ15VxQ0/mJ7I77C59nX/f7wZgChbjnLCLb4G/pPHRtSsKPryO33jGdP4rr591q6txDPq4I9N5geOSpNUIzUOHfZ00T1s/5IvvYBT5bWnbzYeM99L/ElwdOzCitQ3DWt06EZPyv1hH6zbe20nsbHGc6I4TwR+kmcUmhnMLN1MjaK1uPE/y0+CPd5ZcZbJW+HjvP4k7KqPpWIfufEq5sR9hJV2wlT716/nEos2BvWKEp0/pu8g6TU8rHzbNTUZwW18aEzX8988knTZNGvq3izVx12FjfjBThbfwUeEPn/MQ10132jaOB7kldjtYqhK2T9u/mzCS5/gYJyR91xQVXt/NpaTVyrOLxQxcllRSiWdMKyX+mrA8ItWTZdEnk5gR5rodUEP+ZbTe2GlLbA5ixK/HrukA02YC/ODH+Ihu5TINsvuxlPcDHaufbeFEq4RTu2AkNgq+u49SM6YlndCBDrodubOj3iopKg8AR7jyXQJDlSvB03BO9etAKQs1iSYr/6sQnyf+RJ4kdZGVxztzh8s/IOANH69IsAMdNkAyBOXZBc3EFAIOQ3r0TB816LdaHUQ5pwwtT2A8dgdjn8YkbpX4cPfKnb9Nxojh+BD9rcjnGhSjBa++Z24EfwLyJoFOIRIqMdQdJPVpDobiOJUs9jdB9fdUC+nP4gdcqm8M9oRBo6ZuF8VsH8hE587U/1/GvLCRU/KeJO9SofTVGsGdYbmSBriuoDzE5Ys55pfV+BIOzJ4iYArVyFgRfuT86Y1pUasZXg7hBps1cpsPkPZCg5xfhHxL+me5Yhv4X/T3uMNnoDutpvQ1lXbDKs= X-Forefront-PRVS: 0302D4F392 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(6049001)(39840400002)(39400400002)(39410400002)(39850400002)(39450400003)(2351001)(86362001)(575784001)(189998001)(110136004)(42186005)(33646002)(9686003)(2906002)(230700001)(7736002)(50986999)(97756001)(305945005)(6306002)(50466002)(33716001)(54356999)(76176999)(4001350100001)(46406003)(6666003)(5660300001)(53936002)(47776003)(66066001)(77096006)(6486002)(90366009)(6116002)(8676002)(3846002)(23726003)(38730400002)(2950100002)(81166006)(83506001)(478600001)(25786009)(6916009); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR15MB1508; H:[127.0.0.1]; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR15MB1508; 23:fvnJNYF62MS1Z93SsqqCYsLTEZmUsMAI0qtbrFyXO?= =?us-ascii?Q?M0z2egaz8q/QYrOdF6Cih11UvNvDzuw6GjgBHOMTJHvM5TYCpqN+lWJVRA65?= =?us-ascii?Q?76DpmRbbZz4cTgnzd6IsXyOyHl8b//uihgwrGMmk6gBg7fuEYm3ImqeO4yTz?= =?us-ascii?Q?JFLeKysN1Bf5PwM5z8cBvXO0v9yxhemw+lYpzUcwDirAUdiYb0Cc9JuPEEfr?= =?us-ascii?Q?k/R2T9ima9yEkhhMUeWVCKazbPzFXf/taPMvjffE7+VpR91kcrcjnGWF9y6P?= =?us-ascii?Q?QWifp9w+N2yHbxZgKjIQ8Ae43ZIhZjkoCz7nHRy4lbQCVeUPZ7OxqI128F5J?= =?us-ascii?Q?P47+kEQIiHCQ1eMoRF8MwzzDQj3QDGY3MNiXYGoaKYSWUiRomXKC803/R+Mz?= =?us-ascii?Q?v0psGTn+E7Pk7Xn/PjPe0jYwROeCMpeIkjqM5bS6DMG1hy5/tCHQyPG4cmrn?= =?us-ascii?Q?4qvEorZ7uoB6gkjThqTIkxVhrdobzK+wnS8+eNLfoJbHL1LN4UdoUNJZ8VBD?= =?us-ascii?Q?H65SeL3gQjoRDyRDwl2Zx3xxtjmB9r8FDFwQTnnDrdru2GoexnVJ2IaomBzU?= =?us-ascii?Q?MWtm9jld7r6qwjkOfSCnYC5B8Cm6ZIbXDC/xIsWOUjMiKlkod34P7Zie/qAu?= =?us-ascii?Q?9od5NYu5dhNy7rIrt/vgeu2470JDmC8atWDXuN846/uGI0OXU4WzWGHAw91O?= =?us-ascii?Q?UfI1Iojmb6z0kIddWSTivVBUiN+F5Czha6YJngd5bMh8gf52hgThG/sQBeTA?= =?us-ascii?Q?zdBL5bmpwfU1xKGAvmhcKnfADrp2TP/anfAZ9XpMffzZt7SP71wnWp90i7nQ?= =?us-ascii?Q?wphWZ85njXJIWlzVbvrdR4hG3AmBrpYi5WJEVQ/HfgcWmEK6vKSTHX5ll2Yj?= =?us-ascii?Q?L/pusZlvmGs5KmZfGKYKiYalit7tI85vKoNrjHnrzKpv/vy6NRFOtQU1+jdm?= =?us-ascii?Q?7KNunwt9TMSTjBAs9bjToBj31Z7w8Pz8Bw9U/3vSvSIgcxz6ns3s7DBdqm1X?= =?us-ascii?Q?A0+tSvL+5qAa30syU28UC/OvAvtYkuzygXXNfbYuB+ArYsmxqzVGAR2pihsh?= =?us-ascii?Q?mwsaAriyFPFZ40pCdroIx4PzagSSfWSZ+SkSc5nR7o3VCy1o1+zZbOcAYlUC?= =?us-ascii?Q?/GKNdm/B8jvt7WawexS6N0aiC/JRRH5Oj5UQRWDTT6OWdpvvxkHH4TynaHiQ?= =?us-ascii?Q?+lI9epNOmbF2F7Gq7Ogd1lGQ6ES3dpDJ1Ap?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR15MB1508; 6:N2h8TxtVjLTXEShnHxMWX3Z5lNc7saLGXvSNAfxh+oVy/lwJFLE1lEj82B/6QgudV5cxg79MhG3lAob+Y1IXLmQwVOcExOc9eASH7t4D8rY252DreXGk0bv1BUHXiYaZCboQLUMQgbFK1AGY3auKSnjkXL5nl5tNScT4gthlu225K/1D8vRRzTxNCEP7eUQZRgbVLX8HLRYDJpGiC06gnIlG5owTUgfGEs79BUs57oemBhAGG6NMo/XIIcp/FNE1bYx2OptOwVR9OoSDEw4rZPT4DuHDzVsaykJNjH1k1bhboSBu/A60fPXTE2Zhtl/tUq0eJaYELOULIGo57oqvFAJius9CWQJpb7LPW/+FW+2AiR9dWe62K651YVqKleHeOarqfHafs95OEbUZpASApzfFJ1n3G91e22YS6izBAxEsJogyUDQ60lb5/mBWoFc3gzrqQOIobQPupw4SHlPEIjwUXc35rav/hqx8RZpdJ590vqLgYY+iQUG2o4gdQHBCeFnQhBqM5LUCkNrZ5KbJSg==; 5:2uxqsmBANiWX4GkLwDaAhvbX2CMg36oi3Q5yM9TVm/KoDLNVGPXAKfQgVTPltlW1f/HDsN01wprXpxI/9rBj0amWCJWs7qEZbU6+F6I1CmF9Y9iAgTS7385PlEq9XrWGG3LeQqhsEqrXxT1MCJVjgQ==; 24:7f4m0xTo8vXs53IyS4zPQHymzFWBt4KyheTB9tlUIWOr2WjIjJIqY8aFW4C37IGUbNbs3NMdgNDfXTxm4fa2VPPoXcwLPzYHsrDBNWDpkmM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR15MB1508; 7:VUJdKeufDoCLgnOcmAcj53Ns+0TwIrIo6q7n904HG6U9um/YlGe4Dg90dsRAzna+21pLW/9RIPFbE4oHzCfZohYlGnwwLXZHJaAPTYSvw7bi8MHc0BJpN95pyxIBT8mGtJ1uu9QodbgDVE9DrS6BbW2URfBflVUNQktw/Bx+WhlxpV9R6pDlA9zy25sFO7mBDxYq6oIX97Qmnv6kIw7r+SiQNqJ08EbpKpnVMiw91ue15L5GlDoMtjSS9LIzEIo/nUXIybC26QrmaW+TcAdCR3jgQJdCQ3/x8MPFlNJef/YkSuBxRdoHPhzbUsiAIHcsBUlJ+CCFE+FivkGWt7lMIg==; 20:V3Uu7N7BsD9jMIeyJTBt4jy+xLzH6dbZ9gDjMByaXhm/OLFDPA0ks8BfJ4QM+fYBxGqoBiCpcbYs4E/5YBJEGbmuTJxJFoPuLDJD/oBYTxbUWaUk+QFRJENXwvDyL7XCZ9WRmmAab3LngcMbs6lhrvEUlDZ4C2TcmEUqmk71uFw= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2017 01:07:35.4626 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR15MB1508 X-OriginatorOrg: fb.com X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-05-08_17:, , signatures=0 X-BeenThere: mercurial-devel@mercurial-scm.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <mercurial-devel.mercurial-scm.org> List-Unsubscribe: <https://www.mercurial-scm.org/mailman/options/mercurial-devel>, <mailto:mercurial-devel-request@mercurial-scm.org?subject=unsubscribe> List-Archive: <http://www.mercurial-scm.org/pipermail/mercurial-devel/> List-Post: <mailto:mercurial-devel@mercurial-scm.org> List-Help: <mailto:mercurial-devel-request@mercurial-scm.org?subject=help> List-Subscribe: <https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel>, <mailto:mercurial-devel-request@mercurial-scm.org?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org> |
Comments
Jun Wu - May 9, 2017, 1:07 a.m.
Patch
diff --git a/mercurial/osutil.c b/mercurial/osutil.c --- a/mercurial/osutil.c +++ b/mercurial/osutil.c @@ -1302,27 +1302,7 @@ static PyMethodDef methods[] = { }; -#ifdef IS_PY3K -static struct PyModuleDef osutil_module = { - PyModuleDef_HEAD_INIT, - "osutil", - osutil_doc, - -1, - methods -}; +static int precheck(void) { + return PyType_Ready(&listdir_stat_type); +} -PyMODINIT_FUNC PyInit_osutil(void) -{ - if (PyType_Ready(&listdir_stat_type) < 0) - return NULL; - - return PyModule_Create(&osutil_module); -} -#else -PyMODINIT_FUNC initosutil(void) -{ - if (PyType_Ready(&listdir_stat_type) == -1) - return; - - Py_InitModule3("osutil", methods, osutil_doc); -} -#endif +PYMODULEINIT(osutil, methods, osutil_doc, 1, precheck, NULL);