ericmandel / pyds9

Python connection to SAOimage DS9 via XPA
76 stars 41 forks source link

modify __setattr__ to make setter of @property work #34

Closed Fmajor closed 8 years ago

Fmajor commented 8 years ago

see issue #33

montefra commented 8 years ago

@Fmajor : thank you for the PR. I don't see problems with merging it. I'll do it in the next days, unless @ericmandel has reserves.

ericmandel commented 8 years ago

@Fmajor @montefra I have no objections, and will defer to your Python expertise.

montefra commented 8 years ago

@Fmajor : Sorry for the delay. I have just merged a very big change into master (I make pyds9 look like an astropy affiliated package) so I cannot simply merge your PR anymore. Now we have three choices:

  1. I do the merging. However I don't know if github recognize the contribution as yours or mine
  2. merge the new master into your branch, resolve the conflicts, commit and push it to your repo. Here is some info and I wouldn't be surprised the PR page gives you some other advice.
  3. we close this PR and you open a new one against the new master applying the changes to pyds9/pyds9.py

Let me know what you prefer.

Fmajor commented 8 years ago

I have completed the second suggestion.

montefra commented 8 years ago

@Fmajor : thank you very much