Cross-platform username

.gitignore

@@ -1,3 +1,4 @@
+unittest
 RELEASE-VERSION
 *DS_Store
 *.pyc

hashpy/__init__.py

@@ -10,8 +10,8 @@
 
 """
 
-from hashpype import HashPype, HashError
-from doublecouple import DoubleCouple
+from .hashpype import HashPype, HashError
+from .doublecouple import DoubleCouple
 
 __version__ = "0.5.6"
 

hashpy/hashpype.py

@@ -15,7 +15,7 @@
 using this version of HASH.
 """
 import os
-from pwd import getpwuid
+from getpass import getuser
 
 import numpy as np
 
@@ -262,7 +262,7 @@ def __init__(self, **kwargs):
         self.esaz    = np.empty(npick0, float)
         self.arid    = np.empty(npick0, int) * 0
 
-        self.author = getpwuid(os.getuid()).pw_name
+        self.author = getuser()
 
         if kwargs:
             self.__dict__.update(kwargs)

hashpy/tests/test_dbhash.py

@@ -53,7 +53,7 @@ def dbhash_run(dbname, orid=None, pf=None):
     try:
         hp.driver2(check_for_maximum_gap_size=False)
     except HashError as e:
-        print "Failed! " + e.message
+        print("Failed! " + e.message)
     except:
         raise
 
@@ -115,7 +115,7 @@ def save_plot_to_db(fmplotter, dbname=args.dbout, dump_bitmap=args.image):
         p = FocalMechPlotter(ev, save=save_plot_to_db)
     else:
         # quick orid/strike/dip/rake line
-        print hp.output()
+        print(hp.output())
         p = 0    
         if args.dbout:
             db = hp.output(format="ANTELOPE", dbout=args.dbout)
@@ -128,4 +128,4 @@ def save_plot_to_db(fmplotter, dbname=args.dbout, dump_bitmap=args.image):
     import time
     t0 = time.time()
     ret = main()
-    print time.time() - t0
+    print(time.time() - t0)

hashpy/tests/test_hashpype.py

@@ -1,4 +1,4 @@
-#/usr/bin/env python
+#!/usr/bin/env python
 #
 # test_hashpype.py -MCW 2013
 #

setup.py

@@ -4,6 +4,7 @@
 import sys
 import os
 import inspect
+import setuptools #enables develop
 
 from numpy.distutils.core import setup, Extension