From patchwork Sat Nov 23 17:31:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Fleischer X-Patchwork-Id: 1387 Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id 0F2A9153BF266 for ; Sat, 23 Nov 2019 17:30:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on apollo.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1, MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_MED=-2.3,SPF_HELO_NONE=0.001, T_DMARC_POLICY_NONE=0.01 autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-BL-Results: [127.0.0.4] [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Sat, 23 Nov 2019 17:30:24 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 8463A16D189010; Sat, 23 Nov 2019 17:30:20 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [IPv6:2a01:4f8:160:3033::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: luna) by orion.archlinux.org (Postfix) with ESMTPSA id AD33816D188A47; Sat, 23 Nov 2019 17:30:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1574530213; bh=GFmgCoEx+ZWxDK+j6/f0CYh2/yiwRVZJG2BkpYt4BIU=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe; b=KM4h89/WIlL8JTDXKEtr6nC3KHFLnfd3l9RSmgnM7dI4GnQOyzoALn2Q0EApIqG+j M0gUdkAbP5XN9s3XGagOCcui44VGDqj+iIm6/JVH6ogLsonM7L9NOze0zxSeu8K31x YXCeftZJaQcIxMdbcmG2/or3RJmZhO3aklUl3RJikX1sZDaXL22/2EBb0omsS+2GA6 WNX0myIa7pe/N2LP3grTVDLhuoXf+1uMuha9akD1mi8lopjwVwe10T8fg6IExQX73W xxnuNNhlZIf1JLBUvKJH+vbJzvtAa9ADyljS9yZHJ6P8l9PMUDWcSq73um6N7kMnFi 39YFf7xnKhv8+UjhbOEw4j0QrQO6bDtFVeuqSy3Pz7s6rOd8QJULZBJLI6z30SQYHH QYfaRwFeBquchkrPb3okvVIVFPodCFxl3vHouId9Z/DFrV4nWZCTx7udiW7lwq2RkN +xNYXDrlWwZpRBmRGa86bGeQYBi6XGK7qzTn9KTSpX0cx5bEdglFuRPq/VqGqrWxZ3 sBttAcQ1z0ukNyFXn/AiDiDY4jEOGNsQd5Kxjx0KWFBSnJwNuOkLhrwu4tTYBK5oZC 7pQmc5aTeewcKAn8xH0Zob5hdYJA3Bw8u9sARAzJcUGtpLqq35hqd7xXOXVyqduYx2 QmQNC1RzUEWOoTCXX3GgA+uY= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 27CBC2B790; Sat, 23 Nov 2019 17:30:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1574530212; bh=GFmgCoEx+ZWxDK+j6/f0CYh2/yiwRVZJG2BkpYt4BIU=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe; b=m+YHwFBfh5VtR5irPST/k4WzlkVS/vss8K3mPebb/a4qo1pMuw9VjIzrLainb0+gj 6+n2wfJezGM5sgDj34Xbkh6gnceGG/SRHBiYJIQsQQH9iZjvt83VmE8c3+gg+RpGkS 1mslkTY2Vu6NDyM7fg0fKO+jhIXeYVy9cmcLtePEAXJvKF8xpsWQyrl+K9DDK9jckv OK1/kELN57Kj0PszbDFjHxk5qewRM4LmWMiCI22ZF6ZqE9fOkQ44JbMj9TNLkCrY/R XxyxL7ZT2CnTOhmUcUlRbIk0bhySXRfWyAa61JuIYNVOjoYPU28JMjbbWq8L1RNGa1 vb/UZa2MF3H933Wd1WTmFaDyWPii3Gj6VI6os7dRuPTL05tsj3hMbj2eP7tKmJsEN2 09R9s6lwM+hCsdAIBXGLmSFpk+2Qj3hg+C4Y4O2B2t3eRgcyqZ4er3RDbfDFZ6KAmC bR98wIEAMDSrNdEtVKSAVdSDOZBaum2NxDpl93MrapJYTDNxS54/mMhVCF3swVKHrm 0Mu227ih2iHWQEweshourCBGKZRSQj3AirIBJ+DdLpwVnHzjqI8ABAODiYMTWg8llc 3IH9Tbv/sMJtTxzRSEduDpZ6IZvM30JlshJJYZInkgjRPYdESaGGWU7UYupc1Iead8 ljM+Kc32HcqBuh91WWjFyPfg= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id DD7C52B398 for ; Sat, 23 Nov 2019 17:30:08 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by luna.archlinux.org (Postfix) with ESMTPS for ; Sat, 23 Nov 2019 17:30:08 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 839AA16D1889D1 for ; Sat, 23 Nov 2019 17:30:04 +0000 (UTC) Received: from localhost (unknown [72.138.14.22]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: lfleischer) by orion.archlinux.org (Postfix) with ESMTPSA id E177B16D1889D0 for ; Sat, 23 Nov 2019 17:30:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1574530204; bh=GFmgCoEx+ZWxDK+j6/f0CYh2/yiwRVZJG2BkpYt4BIU=; h=From:To:Subject:Date:In-Reply-To:References; b=F3cGgyCdiXno8rK4N+XPLPuGkZSiftZ8EWWB7TVnlverzKo4ECauSphjXA/XrG+NF bJkuAEM8iBlb+EiZKn+6R9WOJL9/6nKOGT3tF8cHyUgnWMReRoF+p651M5bwB9Gpei qmwq8qPCFiJVvtk5tg+cm6v35eEjsayZrz2cqD46kuurn3boRa3br3LsvIlD26fnPE ZWIG+7fhhh7rOPZWru9wNu0H0qL/UunyXQ2azzHM5YwmKCiCZhfp6Km1J6DY1lRZH/ XMbWJGn9jbKsCnv4lbFhjpUKlEFnJfOF62AaNf3j1l1ygV4Aebo3wOR9je6S/wilIY 1oIlfm0o3G5xzms8c2hZgg8OwGd1V+dO/OosguJxs8VQGJ0sX4h51WD9sOp2Khz8EJ BIMunyVBWQrURexzm4korWg0CnvLwe17SkieqeH7s9Myo1bNA4xWDCzEhvsyekoFTy Rk46GRHd4nfaBoMCHed9xXZj/eITwXvLinLjMGe5F0Blb2xw5RUS9MT2czhVqF84n+ +Q/rUMs2dJqOpEUyL7DveOm8LV9zSews/4MoyfGZEWWI1Wz6EM47wolG3UQzKOyS/L XYPepaZGl1Ecf2dSmvBDwbsZRmmk/ifbSP0F5d3TFrjf7wm5ipqRJhCmLgZaxkQw7W RAYcqxiykAkbrNCDFOrfo6NQ= From: Lukas Fleischer To: aur-dev@archlinux.org Subject: [PATCH 2/2] Don't require all Python database modules to be installed Date: Sat, 23 Nov 2019 12:31:20 -0500 Message-Id: <20191123173120.11185-2-lfleischer@archlinux.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191123173120.11185-1-lfleischer@archlinux.org> References: <20191123173120.11185-1-lfleischer@archlinux.org> MIME-Version: 1.0 X-BeenThere: aur-dev@archlinux.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Arch User Repository \(AUR\) Development" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: aur-dev-bounces@archlinux.org Sender: "aur-dev" We support multiple database backends. Don't require Python modules for all backends to be installed. Signed-off-by: Lukas Fleischer --- aurweb/db.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/aurweb/db.py b/aurweb/db.py index 0b58197..c6d4de1 100644 --- a/aurweb/db.py +++ b/aurweb/db.py @@ -1,5 +1,12 @@ -import mysql.connector -import sqlite3 +try: + import mysql.connector +except ImportError: + pass + +try: + import sqlite3 +except ImportError: + pass import aurweb.config