new fixes

[pteek]

Thanks @asmeurer for the fixes.

The universal_newlines=True is not needed on windows for now because I had hard coded the proper regexes for it. I will fix this later.

[pteek]

@feross
The version.py file is conflicting. Please merge it manually.

[asmeurer]

Instead of duplicating the script you can add a symlink. I don't know how Git handles those on windows though.

[pteek]

I don't know how to go about the sym link. How will it work?

[asmeurer]

Delete the duplicate file and use ln -s spoof-mac scripts/spoof-mac.py (at least if you are Unix. I don't know how to do it on Windows). If you commit this file git should track it as a symlink. I don't know what will happen if you install it. Distutils may install the symlink or it may install a duplicate file. Either one would probably be fine.

[pteek]

I will test on *nix and windows.

On Mon, Dec 1, 2014 at 5:22 AM, Aaron Meurer notifications@github.com
wrote:

Delete the duplicate file and use ln -s spoof-mac scripts/spoof-mac.py
(at least if you are Unix. I don't know how to do it on Windows). If you
commit this file git should track it as a symlink. I don't know what will
happen if you install it. Distutils may install the symlink or it may
install a duplicate file. Either one would probably be fine.

—
Reply to this email directly or view it on GitHub
#37 (comment).

[feross]

@pteek While you're at it, try to fix the merge conflict.

Give me a ping when this is ready to be published.

[asmeurer]

I tested randomize in Mac and it works in this branch (and doesn't in master).

[pteek]

@asmeurer

Please clear the branches you are referring to.

[feross]

@pteek Looks good. But please address my inline comments.

@asmeurer Can you confirm that the current master branch works for you now? Once I hear it does, I'll push a new version to PyPI.

[pteek]

Done.

Next I will do the symlink stuff when I have my Linux machine.

[feross]

Okay, let's wait for that before publishing a new version.
On Fri, Dec 5, 2014 at 10:41 AM pteek notifications@github.com wrote:

Done.

Next I will do the symlink stuff when I have my Linux machine.

—
Reply to this email directly or view it on GitHub
#37 (comment).