Submitter | Jun Wu |
---|---|
Date | May 13, 2017, 6:55 p.m. |
Message ID | <86b0d4567e2f7876a492.1494701728@x1c> |
Download | mbox | patch |
Permalink | /patch/20602/ |
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 C65702C216; Sat, 13 May 2017 14:56:03 -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 QSIcwIYZ70fr; Sat, 13 May 2017 14:56:03 -0400 (EDT) Received: from mercurial-scm.org (localhost [IPv6:::1]) by mercurial-scm.org (Postfix) with ESMTP id 6A2AB2C279; Sat, 13 May 2017 14:55:57 -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 CABBD2C211 for <mercurial-devel@mercurial-scm.org>; Sat, 13 May 2017 14:55: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 5809P8MYHyqK for <mercurial-devel@mercurial-scm.org>; Sat, 13 May 2017 14:55:54 -0400 (EDT) Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by mercurial-scm.org (Postfix) with ESMTPS id 231DE2C214 for <mercurial-devel@mercurial-scm.org>; Sat, 13 May 2017 14:55:54 -0400 (EDT) Received: from pps.filterd (m0109332.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v4DIrfRp001380 for <mercurial-devel@mercurial-scm.org>; Sat, 13 May 2017 11:55:53 -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=VU85/XN4zApu2s0vlIaJ7qvyGHkmi2mr+m1oKXKhqP4=; b=pj8unPiavZAZViadT5Vx4xdep0Ba+doq5Pe/Zs+fnusq5o8jMNQtC7VIJs9d+3E1IKax 234BsQjsYOITI3GyQq9Jr0KuKmlJCGKfcinsWC+B40jk4xsjkQFCBpg4Ecc9wz0MRlh3 oqaw+uPudl/hfOiLFViMcZOMHuUrQcOAuis= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 2adyvgs5nc-5 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for <mercurial-devel@mercurial-scm.org>; Sat, 13 May 2017 11:55:53 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (192.168.54.28) by o365-in.thefacebook.com (192.168.16.18) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sat, 13 May 2017 11:55:51 -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=VU85/XN4zApu2s0vlIaJ7qvyGHkmi2mr+m1oKXKhqP4=; b=UGkjq1RumdW6Ah/jzs++sPGHMF30yYLssW8F0tGKpWU4/z36YvsxC5NGqHc299Ji9OUERB1nccIdlXoD/IIx5EXzX0fKLn1WNiQvMxAJwJ+FTVSJxLpvT23B6SvoEDtnflx8O6UKDOsqZnPsJWVX4YeyDccu7mYr8/A/vElBCn8= 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.2) by DM5PR15MB1516.namprd15.prod.outlook.com (10.173.225.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1084.16; Sat, 13 May 2017 18:55:41 +0000 MIME-Version: 1.0 Subject: [PATCH 6 of 7 V2] osutil: use PYMODULEINIT X-Mercurial-Node: 86b0d4567e2f7876a492ab2e60220cadb8191625 X-Mercurial-Series-Index: 6 X-Mercurial-Series-Total: 7 Message-ID: <86b0d4567e2f7876a492.1494701728@x1c> X-Mercurial-Series-Id: <55ae1324c950e76270cc.1494701723@x1c> In-Reply-To: <55ae1324c950e76270cc.1494701723@x1c> References: <55ae1324c950e76270cc.1494701723@x1c> User-Agent: Mercurial-patchbomb/4.2+83-789f2d14f5b1 Date: Sat, 13 May 2017 11:55:28 -0700 From: Jun Wu <quark@fb.com> To: <mercurial-devel@mercurial-scm.org> X-Originating-IP: [199.201.64.2] X-ClientProxiedBy: DM5PR2201CA0037.namprd22.prod.outlook.com (10.174.180.154) To DM5PR15MB1516.namprd15.prod.outlook.com (10.173.225.149) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dec71970-838d-420f-c830-08d49a31a7ab X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:DM5PR15MB1516; X-Microsoft-Exchange-Diagnostics: 1; DM5PR15MB1516; 3:K2lK2A7RYvMUW1z8SUuWMd/QMLby8U4Pdjb4gsVOtAaiiZu0FvLQFGC5goC07nQA1fRruIjq2RDELsWRkP6w2ywWte/ODD/2e/JFSsdQLWPyJXepxo7hwlcxy89T0gCeaGY6JQ/3hIVXzE8UrCqd+Agh+GwrcbbApDkUSXC67VuibjrOGr/4FHrV5nBPWKbpAad80WIXtVwZ51opi08ndeBFhWwN3KQ9qCTZqjQQvyK5Ntv+x9fkUFT1r9ePfHlLtmIsBzXBNQwV7Bn+7uIYQXAsHKXVBwAA1KUL02c1fzndsgHmlo8U3yk5UvLw3DuxvsJy//cxtaK4qmBEnLsX8w==; 25:RUYd8Iquzq+RB/nll7RxAiud9iEVao5wzNlYTGmh79Ccr0UmShricsHcPAVZi05bXoo/gtY4sQLJ1KeZJ2Mmuder8C+gpl6UCa3dsqw1VGK/x6y1fjGFqZDJIQELGkdEcVOChbTf+Ep/GnSDHiS1cPfW5sy0wh+JPiKeC28pnOlJsVvIqfM9kUKo+uph8N2kaD+6V/rg+ESI43q6ychuxfHeEdAWNMLuwVE5QC0GOW2zn1hhHAQlQ1HdPGitc68j/1xnyj20dd/DFbrrH+v+K4ilZAthW5OcJ/58T2ds+lXqSeLOiIJE+cKGFTc7ZJGjMyPa8TmNojHQgS7YNzRSJk47lRmbNaF3P/qAhQQWNLoG7y47KwpD9bI1FO0AtVRwCqJa4oLwIO6tlYnq+GHc01I1eyw6x5nIb956pVMNNe0HA5tsj04cPDtdA0TmwBV39TQlYswkTftYUP0cIAIw3wkyEVUfD+4jU0wjV0N5Hdw= X-Microsoft-Exchange-Diagnostics: 1; DM5PR15MB1516; 31:3BlXYbKt4mk68Eyo4px3ZyY9GkNGQtyaE+vLsMceQ5BuiA5fkTJWxCOxCiY2vMCOOG1yLij4fR7RmlwwJ5M++80PmfZb1bwEz9Aj3p1ZsIknpW03wB/HZGgYsNmxwHOhX676LUZTEyDdz1KmbRckT9wZd9HD0kBfa1YCe4kMzuucfaG6frKz2AtxZYY5PjwuXuwX3MUHuDY/GqXyrdATFF9cDBBUNUVFwwx61G9DHzZyWFtU5a3iwvdLcwaahfv1L5VUy+i2Xh0XrU1BvTiRd7bU1+0PPDk8MwNUv/a4ckc=; 20:2ok7r8f6sFu4A4xfmBO9uMt+g8/Xm7Wm/GZpjGJsY4tpZe76d11DbmlNRVdnyY0IEmQqf7rl6CyZAsXRDcE3fKojtpRYYboWSNoJsAJGl8ITFM5x73A0iL98ErjlA8O2saY0NEjY+6lluKgFjjDeTpHkz9t0XFGtiC8wxnmFBAl1vFl81zIIechve6/m4ivL8DiTKHXXD+7Dimu3pzQbHPmps5ir39CFpWvvjip79WZKjg1fq7WApIogAwMYTjfJF96gBoPA75QQNoR1yrQXosuWnUt91IYLIyARP+uPXM3nwwQuRSo7/N9SG+rWdADv+tDMxKYZLp/dKyU3qG9K7D4YVyrixcXs+BYx6LQ4MQAeD4kvIUmANKhIre9LURD/xebpDzV+1rAeipv2RAC3+Fv9ASGSITobCaqEOpqJcZrINDFG5XVxnNSeU5mtK7FQIvoWjK7LAZV79YXttWokBRJeUdhjujbITnM2kDmbp7EPTIV43MpZnGr9BZ5qtxnv X-Microsoft-Antispam-PRVS: <DM5PR15MB1516B09E46428BC1EDA93EFBCDE30@DM5PR15MB1516.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)(93006095)(93001095)(3002001)(10201501046)(6041248)(20161123558100)(6053077)(20161123555025)(20161123564025)(20161123560025)(20161123562025)(6059035)(16040078)(201703131423075)(201703011903075)(201703061421075)(201703151056150)(201703061814153)(16043105)(6072148); SRVR:DM5PR15MB1516; BCL:0; PCL:0; RULEID:; SRVR:DM5PR15MB1516; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR15MB1516; 4:1UOlC0+k4Zk5kgDwatrPIA+mAkCD9d0++TrAcZDhkL?= =?us-ascii?Q?AVj5RyNQ70N43+NuiLuXzefEWmHbJ9//yTxUcELTiaHqmtQ6Jmfy2bNsaf6z?= =?us-ascii?Q?s4qkFQeJun8XVXJiAq/ZhKjinLpl9ZIdByJ5vxaifAThLJ7yFHKslGMrd4P0?= =?us-ascii?Q?56jLGOpxCLAI4dhz8b6LTuAiNZgCmrWLHo/SpcNEjP2+da0YdwP3A9OhC5Vr?= =?us-ascii?Q?rApB9SqqZ7Y/qCGDLZPYpxLqx9T4e0pIbq4cgsa8eIXu61cy6CUuEUbtCBV4?= =?us-ascii?Q?qfzBw1+wJ+nF/dIN9mA7XRNJpgdUY/yIdWv9j3Xd6B8E2Zb3gUjjPtIiSAQN?= =?us-ascii?Q?k5YyEKwhXhKmTyyQnUmbzIx186ZKI4nbHl/7/HNsOuGuXkKxSqbNCNoepEmA?= =?us-ascii?Q?CmNyw+J/FTItVIeOdTn6rPKj0VKRGYau70lwzZmh/vqihLF0CSnGcZQfBNPt?= =?us-ascii?Q?yiiNanEMdoKLV+aa9sr5Uiknym18G0tCwywANhbmeLV20JNTAT8XzxCyniCf?= =?us-ascii?Q?0M7BYfE3iPhEXIbt5QEjkbgd2Co268QUeHdBW615ZE5JvZmT7jSXkPsz30Sr?= =?us-ascii?Q?MBOwpyughtfR9sbHA5AAFvzl2W4CBXbNvF4qAvfJYW7DcsBuqDml+vcdaEHU?= =?us-ascii?Q?fJr3FND4mA5NN7Mdvi1vhCJJokfaAhPfRwGgepWoQKHra1w9tPb5eUC1oXqL?= =?us-ascii?Q?hNx582z8fxi+nX811CORnhY8V9FxeRhrXNvLHyCXbp8YadZ2dLTkNXEvmmxl?= =?us-ascii?Q?CVOFHuGQwe1OMSsK8WENhCHcwLP994939jFerAxzM43luvTHB/vu9KOi4w1O?= =?us-ascii?Q?UuCqSFEQTkbjnIuMpATPDtT+htMHvgAIfzms2SFhqijDgY1Bc+idtpz4XfSJ?= =?us-ascii?Q?ThY6q/mWz6aG4Tg/dU16WSSwn7vWlLMAQ48/mWNrirn98VL5pqgXIfKTKJhJ?= =?us-ascii?Q?UOVFtA+Hf1J4J2wY3SMvY9jRPZCyhVHj4RW5156wARNFwqb63pU/TTwD7Iys?= =?us-ascii?Q?I=3D?= X-Forefront-PRVS: 0306EE2ED4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6049001)(6009001)(39840400002)(39850400002)(39450400003)(39410400002)(448600002)(7736002)(305945005)(230700001)(110136004)(5660300001)(50466002)(46406003)(83506001)(86362001)(33646002)(575784001)(25786009)(2351001)(2906002)(9686003)(6306002)(53936002)(23726003)(3846002)(81166006)(54356999)(76176999)(90366009)(50986999)(77096006)(6116002)(6666003)(2950100002)(6916009)(38610400001)(33716001)(8676002)(47776003)(586005)(66066001)(42186005)(4001350100001)(97756001)(189998001)(6486002); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR15MB1516; H:[127.0.0.1]; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR15MB1516; 23:70jRl9dj6lREPMJXtcRuugtVMzjt8qVPwY141gibe?= =?us-ascii?Q?BF4o6Xf8vmYF1jxlk9JHOhgwgScwocXomn4hgzNouhHgOvYwQlAtweEG9ae4?= =?us-ascii?Q?yVqMpfGLm1uisFJ1J3mxBuzLQEhBOq7DWaGYbKvHmc6q252ZUSMZ18ljhsDk?= =?us-ascii?Q?wKM4MY0UJtVSfvFfqCMAOCOf4nHh49T4j17PMenf60weR8nThXKQ9LeV140g?= =?us-ascii?Q?SQjxRfBJYnsQBtgZLXAVIeyTwWssSejXb/VZYMgqqo42/zAUs+MNg9WT9vM4?= =?us-ascii?Q?/30Y3pYn/nnNumY2v/WR/u4bX7orKCfBl6HVMUc7RFHXf1LvxIwmEGhLAKH0?= =?us-ascii?Q?i+yroHJ2aADTslnGZ+V1vYt4MvkNJVrLQVu8YvqiIn/A7U/w0rS7J9/qUxXK?= =?us-ascii?Q?LKTzx8M9Wc0tObXDSZvH5lSIPLiZwbyNNLKZVfMW/ErZrieAKRl8/s5YB4RY?= =?us-ascii?Q?b9NFf1AZBFWsl9fP6Coom5UFQjNepTBAnWJoICcBAI1V/1Ha6INNBcaMnzck?= =?us-ascii?Q?AkaAlueCVGLiWMEgYYal1QvnCp0rQW0Dskt+160cggIa4GLoH6uC5Q6caXLx?= =?us-ascii?Q?pp+ldaMhCwpAJp5nDMU7gX1p2bhux8P87AubwAbUC8KlfUiAu455LALGs8xt?= =?us-ascii?Q?gWSulCKKijKlNFZmLhwFs9ZUA2kNrazUywlK0Rzici6bGvNcOh+NXn6imn8C?= =?us-ascii?Q?LNE2YA5pI+GCKHrAUM+scTuvO/E5GHWJwh+73M1g9Xtbfgs5FX8bWOIDa4dV?= =?us-ascii?Q?Z0S8yanFo5CZY9TEAkOB1cUyK/Lk5I9AVHPhc/s/Na2UHJTVDPUDLywhh1MK?= =?us-ascii?Q?//REu/VGbkj2/gJj1sKyLFKTkOceZIO3FoEt1lrWfmIDWaxxCYlVh2JP2VRc?= =?us-ascii?Q?MN3a0LDqlsRmR0C7XsujWuL05j9mqDbzJisj/n+FYMcxNIO/Qn7IpFV3NnBJ?= =?us-ascii?Q?pnDhgq//ePNuTC9f4qO4Pz+r3uxWfG9x5VD+stqWXEPIa9XnKsFhYMDhQVi/?= =?us-ascii?Q?5BiIGJ20pVcD9bA7cSHF7Sv852BaPLTAulaW+Pwnc6KlV3HHuJTsKvm/5BG4?= =?us-ascii?Q?g675ZBnIKwRgNcCplRdGnjruLxf3LOEgbPmHjMXUKUlXVU3APavg3yyW1KFW?= =?us-ascii?Q?73XAu5G9H2UKtc+bEklTbFA9BUXH/ZkwCLs4MjbugK9tYYFQtIiF4PiJScHo?= =?us-ascii?Q?r5L6rnpfhd76ag=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR15MB1516; 6:E1vntUpYjl3sWLCDPl5rGpMLH7oMEiA4OxDYYwOrIHMQPXwystGxwF+I2f+zJBCHke/ZHvg7ijDku671qIySXhC3lezhTIxVNIdGjEwzpxGN3ZnJXnBo1I5bF457Q0uRd4x17NbVD0maSYJ3M3GxhnlHA7JsCmgSQKHlx6Py1hGdOJtrXUbFXOkI5YOyHUlzIRUA0uFTMVCPmK3hHxaG/ytVNvtLxDQlj5huKlHLPHR4yzmn1gQJGD08PJA+XkqbLFY3Ws28AOkYVaCwG6w4YN0+yrCGs05wt607knYarOiTylaBsJiT72OBBIMAzJWypJvB0zkfycf8kv9kQwkHatbhOZizcWbKcY1eoLSNMkBH+fPhwcC+VVRJCzheiVx/ZoF4wKWRaxHpxsEpZsriRtjQjw4zPWB0ybRFNgAJN9TlxTsmkRVkr80ZaGo3KOJivgCMy0Ls1X/ZpmsGAhcncIutdM/rmVbVv9o+eJjKgYRmE0KXKVyqZ0+V7yUx85FKkSaMP4iSFkoKPO8ei04ZAA==; 5:5RoNKVnqBM8ohILEAUw6iHgRW8hMz8ACxeZJmyG6oO/HadOtoM/BJECt0XerXQw7tf79vSx7k/87zIs2yrkb6A1IddhREAv9CzO5J78YERkq9jxWJHuZzJtdViVDM5ZI/rxMIrh3fBI08kT+k/6pig==; 24:N6JskKWhqB3+C2YB7y3v6zq66W8Vdr052y5cQ8oquy4+WH3sLMCEDpzEOlImmi5VsZLESE0D4PVsXPb7/jZ3IL8cw4w37ghcDRJvsWsenas= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR15MB1516; 7:nFWJyRps541qP7/oOx1bu/fisRZ8qj3NOhjLbTIUx4Gq7hbV1x5xMjgtGIwiZATiY4ibFqLbh9iGuXT2NJeIWCptn0xRPf83a7HMSka+ylFg3J/Q2WedbT2f51y+oeVAhw3qlCQMQCwFUjQOLI8fY8FIJlbRJA/GfBVYBb8XwhtsAfvUXUX+Vt3YIh7rQD4E0jj3kVHHcSrJgqNTueQHvwMz4XnyC+Oy5VpSCyllGhAAxyxfgPpX5tAju7vAwpSu2eHNAiGYUc/RIHf4eDvE2nyHjIkeeBK4iF4o+F5B5Ovn2tgccUFzy7n+ByrzrOdAfrqmuSjWfRDSa5GX50VUzQ==; 20:0m33lg2wIgMiFebRiIiYD1jw42nWWB4WF6JfVlQkcZeDC05FEYbEagx/4dCLUWraWspzme2ZIwgn0kHK7DyVkM1+64CeJ2G9R+lAMiLd+ZHFQiahRSZPN4xjpy56ly0HlthCl36lcFhqiEHIUTsfuYajDu2qbB4naNlGXi7GqSI= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 May 2017 18:55:41.9637 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR15MB1516 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-13_10:, , 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 13, 2017, 6:55 p.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(), SKIP);