Skip to content

Python 2 and 3 compatability

Marcus Oskarsson requested to merge py2and3-compat into master

Created by: marcus-oscarsson

Hi

Yet another PR with Python 2 and 3 compatibility issues mostly:

  • iteritems to items
  • itervalues to values
  • and iterkeys to "for key in"

and a few others.

I've also updated some camel cases to snake case, mostly related to diffractometer. The problem have somehow been circumvented by the GenericDiffractometer that makes a mapping between the two casings. I've simply done a multifile sed replace, so this mapping can eventually be removed.

As last time since I did the sed replace Ive also included commits with changes to other sites HardwareObjects, please have a look they are tagged with [SITE]. Let me know if there is something you dont want to change and Ill remove the commit and you have to make the update on your own.

Macus

Merge request reports