1
0
mirror of https://github.com/mnaberez/py65.git synced 2024-12-30 13:29:18 +00:00

Fix imports for Python 3

This commit is contained in:
Mike Naberezny 2013-10-26 15:15:51 -07:00
parent c2884eff6d
commit 086c9c2d7d
2 changed files with 13 additions and 5 deletions

View File

@ -18,7 +18,7 @@ import os
import re
import shlex
import sys
import urllib2
from asyncore import compact_traceback
from py65.devices.mpu6502 import MPU as NMOS6502
from py65.devices.mpu65c02 import MPU as CMOS65C02
@ -30,6 +30,10 @@ from py65.utils import console
from py65.utils.conversions import itoa
from py65.memory import ObservableMemory
try:
from urllib2 import urlopen
except ImportError: # Python 3
from urllib.request import urlopen
class Monitor(cmd.Cmd):
@ -545,11 +549,11 @@ class Monitor(cmd.Cmd):
if "://" in filename:
try:
f = urllib2.urlopen(filename)
f = urlopen(filename)
bytes = f.read()
f.close()
except (urllib2.URLError, urllib2.HTTPError) as exc:
msg = "Cannot fetch remote file: %s" % exc.message
except Exception as exc:
msg = "Cannot fetch remote file: %s" % str(exc)
self._output(msg)
return
else:

View File

@ -4,7 +4,11 @@ import re
import os
import tempfile
from py65.monitor import Monitor
from StringIO import StringIO
try:
from StringIO import StringIO
except ImportError: # Python 3
from io import StringIO
class MonitorTests(unittest.TestCase):