Skip to content

Commit

Permalink
Automatic 2to3 changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Roland Ferger committed May 11, 2018
1 parent 9c61f44 commit 65d86c0
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions __init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
# 3) Explicitly states which classes and functions in PyPL2 are meant to be public
# parts of the API.

from pypl2lib import PL2FileInfo, PL2AnalogChannelInfo, PL2SpikeChannelInfo, PL2DigitalChannelInfo, PyPL2FileReader
from pypl2api import pl2_ad, pl2_spikes, pl2_events, pl2_info
from .pypl2lib import PL2FileInfo, PL2AnalogChannelInfo, PL2SpikeChannelInfo, PL2DigitalChannelInfo, PyPL2FileReader
from .pypl2api import pl2_ad, pl2_spikes, pl2_events, pl2_info

__author__ = 'Chris Heydrick ([email protected])'
__version__ = '1.1.0'
Expand Down
4 changes: 2 additions & 2 deletions pypl2api.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
# copyright notice is kept intact.

from collections import namedtuple
from pypl2lib import *
from .pypl2lib import *

def print_error(pypl2_file_reader_instance):
error_message = (c_char * 256)()
pypl2_file_reader_instance.pl2_get_last_error(error_message, 256)
print error_message.value
print(error_message.value)


def pl2_ad(filename, channel):
Expand Down
8 changes: 4 additions & 4 deletions pypl2lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,10 @@ def __init__(self, pl2_dll_path = 'bin'):
try:
self.pl2_dll = CDLL(self.pl2_dll_file)
except (WindowsError):
print "Error: Can't load PL2FileReader.dll at: " + self.pl2_dll_file
print "PL2FileReader.dll is bundled with the C++ PL2 Offline Files SDK"
print "located on the Plexon Inc website: www.plexon.com"
print "Contact Plexon Support for more information: [email protected]"
print("Error: Can't load PL2FileReader.dll at: " + self.pl2_dll_file)
print("PL2FileReader.dll is bundled with the C++ PL2 Offline Files SDK")
print("located on the Plexon Inc website: www.plexon.com")
print("Contact Plexon Support for more information: [email protected]")

def pl2_open_file(self, pl2_file):
"""
Expand Down

0 comments on commit 65d86c0

Please sign in to comment.