# [PATCH v2] git-p4: Avoid modules deprecated in Python 2.6. 2 messages from 2009-09-10 to 2009-09-10. Participants: Reilly Grant, Junio C Hamano. Thread: https://gitlist.dev/t/20893 ## Reilly Grant, 2009-09-10 07:02 Subject: [PATCH v2] git-p4: Avoid modules deprecated in Python 2.6. Message-ID: <1252566158-13305-1-git-send-email-reillyeon@qotw.net> URL: https://gitlist.dev/e/1252566158-13305-1-git-send-email-reillyeon%40qotw.net ``` The popen2, sha and sets modules are deprecated in Python 2.6 (sha in Python 2.5). Both popen2 and sha are not actually used in git-p4. Replace usage of sets.Set with the builtin set object. The built-in set object was added in Python 2.4 and is already used in other parts of this script, so this dependency is nothing new. Signed-off-by: Reilly Grant --- contrib/fast-import/git-p4 | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index 38438f3..e710219 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -8,12 +8,10 @@ # License: MIT # -import optparse, sys, os, marshal, popen2, subprocess, shelve -import tempfile, getopt, sha, os.path, time, platform +import optparse, sys, os, marshal, subprocess, shelve +import tempfile, getopt, os.path, time, platform import re -from sets import Set; - verbose = False @@ -864,8 +862,8 @@ class P4Sync(Command): self.usage += " //depot/path[@revRange]" self.silent = False - self.createdBranches = Set() - self.committedChanges = Set() + self.createdBranches = set() + self.committedChanges = set() self.branch = "" self.detectBranches = False self.detectLabels = False @@ -1662,7 +1660,7 @@ class P4Sync(Command): if len(self.changesFile) > 0: output = open(self.changesFile).readlines() - changeSet = Set() + changeSet = set() for line in output: changeSet.add(int(line)) -- 1.6.3.3 ``` ## Junio C Hamano, 2009-09-10 18:22 Subject: Re: [PATCH v2] git-p4: Avoid modules deprecated in Python 2.6. Message-ID: <7v63bqd5hu.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7v63bqd5hu.fsf%40alter.siamese.dyndns.org In-Reply-To: <1252566158-13305-1-git-send-email-reillyeon@qotw.net> ``` Reilly Grant writes: > The popen2, sha and sets modules are deprecated in Python 2.6 (sha in > Python 2.5). Both popen2 and sha are not actually used in git-p4. > Replace usage of sets.Set with the builtin set object. > > The built-in set object was added in Python 2.4 and is already used in > other parts of this script, so this dependency is nothing new. Thanks for a resend. Will apply. ```