From commits-return-45389-apmail-subversion-commits-archive=subversion.apache.org@subversion.apache.org Sun May 8 13:42:45 2016 Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B697B19858 for ; Sun, 8 May 2016 13:42:45 +0000 (UTC) Received: (qmail 40639 invoked by uid 500); 8 May 2016 13:42:45 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 40600 invoked by uid 500); 8 May 2016 13:42:45 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 40590 invoked by uid 99); 8 May 2016 13:42:45 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 May 2016 13:42:45 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 1C8E318044E for ; Sun, 8 May 2016 13:42:45 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.799 X-Spam-Level: * X-Spam-Status: No, score=1.799 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id M3fRJR4qdryc for ; Sun, 8 May 2016 13:42:42 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with ESMTP id 464EB5F2F0 for ; Sun, 8 May 2016 13:42:42 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 4DC2CE009C for ; Sun, 8 May 2016 13:42:41 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 4A5163A0336 for ; Sun, 8 May 2016 13:42:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1742819 - in /subversion/trunk/tools/server-side/svnpubsub: irkerbridge.py svntweet.py Date: Sun, 08 May 2016 13:42:41 -0000 To: commits@subversion.apache.org From: stefan2@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160508134241.4A5163A0336@svn01-us-west.apache.org> Author: stefan2 Date: Sun May 8 13:42:41 2016 New Revision: 1742819 URL: http://svn.apache.org/viewvc?rev=1742819&view=rev Log: Replace Python 2 -only imports by pairs of Python 2 / 3 alternative imports outside out build & test scripts. * tools/server-side/svnpubsub/irkerbridge.py * tools/server-side/svnpubsub/svntweet.py (): The urlparse module has been replaced by the urllib.parse in Python 3. Modified: subversion/trunk/tools/server-side/svnpubsub/irkerbridge.py subversion/trunk/tools/server-side/svnpubsub/svntweet.py Modified: subversion/trunk/tools/server-side/svnpubsub/irkerbridge.py URL: http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/irkerbridge.py?rev=1742819&r1=1742818&r2=1742819&view=diff ============================================================================== --- subversion/trunk/tools/server-side/svnpubsub/irkerbridge.py (original) +++ subversion/trunk/tools/server-side/svnpubsub/irkerbridge.py Sun May 8 13:42:41 2016 @@ -86,7 +86,6 @@ import sys import posixpath import socket import json -import urlparse import optparse import ConfigParser import traceback @@ -95,6 +94,14 @@ import re import fnmatch from string import Template +try: + # Python >=3.0 + from urllib.parse import urlparse +except ImportError: + # Python <3.0 + from urlparse import urlparse + + # Packages that come with svnpubsub import svnpubsub.client import daemonize Modified: subversion/trunk/tools/server-side/svnpubsub/svntweet.py URL: http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/svntweet.py?rev=1742819&r1=1742818&r2=1742819&view=diff ============================================================================== --- subversion/trunk/tools/server-side/svnpubsub/svntweet.py (original) +++ subversion/trunk/tools/server-side/svnpubsub/svntweet.py Sun May 8 13:42:41 2016 @@ -42,7 +42,13 @@ from twisted.internet import defer, reac from twisted.python import failure, log from twisted.web.client import HTTPClientFactory, HTTPPageDownloader -from urlparse import urlparse +try: + # Python >=3.0 + from urllib.parse import urlparse +except ImportError: + # Python <3.0 + from urlparse import urlparse + import time import posixpath