From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-881478-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2F4EE13825A for <garchives@archives.gentoo.org>; Sat, 14 May 2016 18:34:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DB81C21C039; Sat, 14 May 2016 18:34:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B474F14234 for <gentoo-commits@lists.gentoo.org>; Sat, 14 May 2016 18:34:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6BF2F340B23 for <gentoo-commits@lists.gentoo.org>; Sat, 14 May 2016 18:34:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 932E3970 for <gentoo-commits@lists.gentoo.org>; Sat, 14 May 2016 18:33:56 +0000 (UTC) From: "Brian Dolbec" <dolsen@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" <dolsen@gentoo.org> Message-ID: <1463250580.22a9d9df146499ebf740eb61964633ba7d6a10ef.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/metadata/, pym/repoman/ X-VCS-Repository: proj/portage X-VCS-Files: pym/repoman/metadata.py pym/repoman/modules/scan/metadata/pkgmetadata.py X-VCS-Directories: pym/repoman/ pym/repoman/modules/scan/metadata/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 22a9d9df146499ebf740eb61964633ba7d6a10ef X-VCS-Branch: repoman Date: Sat, 14 May 2016 18:33:56 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 559f1d1f-7e1d-4555-ac7f-3d977a284b04 X-Archives-Hash: da1f45dbe01310e95d7e6e0a25dbb534 commit: 22a9d9df146499ebf740eb61964633ba7d6a10ef Author: Dirkjan Ochtman <dirkjan <AT> ochtman <DOT> nl> AuthorDate: Mon Jan 25 18:42:41 2016 +0000 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> CommitDate: Sat May 14 18:29:40 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=22a9d9df repoman: Move some metdata_* variables to module it's used pym/repoman/metadata.py | 4 ---- pym/repoman/modules/scan/metadata/pkgmetadata.py | 9 ++++++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pym/repoman/metadata.py b/pym/repoman/metadata.py index 7a514dc..a980184 100644 --- a/pym/repoman/metadata.py +++ b/pym/repoman/metadata.py @@ -28,10 +28,6 @@ if sys.hexversion >= 0x3000000: if sys.hexversion >= 0x3000000: basestring = str -metadata_xml_encoding = 'UTF-8' -metadata_xml_declaration = '<?xml version="1.0" encoding="%s"?>' \ - % (metadata_xml_encoding,) -metadata_doctype_name = 'pkgmetadata' metadata_dtd_uri = 'http://www.gentoo.org/dtd/metadata.dtd' metadata_xsd_uri = 'http://www.gentoo.org/xml-schema/metadata.xsd' # force refetch if the local copy creation time is older than this diff --git a/pym/repoman/modules/scan/metadata/pkgmetadata.py b/pym/repoman/modules/scan/metadata/pkgmetadata.py index 3b48b8e..a7150a9 100644 --- a/pym/repoman/modules/scan/metadata/pkgmetadata.py +++ b/pym/repoman/modules/scan/metadata/pkgmetadata.py @@ -23,9 +23,7 @@ except (ImportError, SystemError, RuntimeError, Exception): # import our initialized portage instance from repoman._portage import portage -from repoman.metadata import ( - metadata_xml_encoding, metadata_doctype_name, - metadata_dtd_uri, metadata_xml_declaration, parse_metadata_use) +from repoman.metadata import metadata_dtd_uri, parse_metadata_use from repoman.checks.herds.herdbase import get_herd_base from repoman.checks.herds.metadata import check_metadata, UnknownHerdsError from repoman._xml import _XMLParser, _MetadataTreeBuilder, XmlLint @@ -38,6 +36,11 @@ from portage.dep import Atom from .use_flags import USEFlagChecks +metadata_xml_encoding = 'UTF-8' +metadata_xml_declaration = '<?xml version="1.0" encoding="%s"?>' \ + % (metadata_xml_encoding,) +metadata_doctype_name = 'pkgmetadata' + class PkgMetadata(ScanBase, USEFlagChecks): '''Package metadata.xml checks'''