Skip to content

Commit

Permalink
remove unicodedata.normalize and add comments
Browse files Browse the repository at this point in the history
  • Loading branch information
Dustin J. Mitchell committed May 25, 2010
1 parent d18d4f7 commit 1377fe9
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions buildbot/slave/commands/vcs.py
@@ -1,4 +1,4 @@
import os, re, sys, shutil, time, unicodedata
import os, re, sys, shutil, time

from xml.dom.minidom import parseString

Expand Down Expand Up @@ -1824,8 +1824,17 @@ def doVCFull(self):
command.extend(['client', '-i'])
log.msg(client_spec)

# from bdbaddog in github comments:
# I'm pretty sure the issue is that perforce client specs can't be
# non-ascii (unless you configure at initial config to be unicode). I
# floated a question to perforce mailing list. From reading the
# internationalization notes..
# http://www.perforce.com/perforce/doc.092/user/i18nnotes.txt
# I'm 90% sure that's the case.
# (http://github.com/bdbaddog/buildbot/commit/8420149b2b804efcf5f81a13e18aa62da0424d21)

# Clean client spec to plain ascii
client_spec=unicodedata.normalize('NFKD',client_spec).encode('ascii','ignore')
client_spec=client_spec.encode('ascii','ignore')

c = ShellCommand(self.builder, command, self.builder.basedir,
environ=env, sendRC=False, timeout=self.timeout,
Expand Down

0 comments on commit 1377fe9

Please sign in to comment.