Skip to content

Commit 8c08454

Browse files
authored
Merge pull request #117 from cclauss/patch-2
try: u = unicode
2 parents 07e6b0e + 0147301 commit 8c08454

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

pyre/zhelper.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
import random
2-
import zmq
3-
import threading
1+
42
import binascii
53
import os
4+
import random
65
import sys
6+
import threading
7+
import zmq
78
from . import zsocket
89

9-
10-
if sys.version.startswith('3'):
11-
u = str
12-
else:
10+
try:
1311
u = unicode
12+
except NameError:
13+
u = str
14+
1415

1516
# --------------------------------------------------------------------------
1617
# Create a pipe, which consists of two PAIR sockets connected over inproc.

0 commit comments

Comments
 (0)