first commit. think i have the two packages imported into one namespace.

Author: augustfly

.gitignore

@@ -0,0 +1,4 @@
+pyvolib-svn-read-only
+vaods9-git-read-only
+.svn/
+*.pyc

CHANGES

@@ -0,0 +1,6 @@
+CHANGES
+--------
+
+Version 0.1.0
+
+    First public alpha release

INSTALL

@@ -0,0 +1,14 @@
+Installing coatpy
++++++++++++++++++
+
+  Prerequisites
+  =============
+
+    coatpy requires 
+
+  Installation
+  ============
+
+    To install coatpy, simply run:
+
+      python setup.py install

LICENSE

@@ -0,0 +1,20 @@
+coatpy - collection of online astronomy tools in python
+Copyright (c) 201? Many
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.

MANIFEST.in

@@ -0,0 +1 @@
+include CHANGES INSTALL LICENSE README 

README

@@ -0,0 +1,8 @@
+Introduction
+++++++++++++
+
+  coatpy is a package wrapper around a number of other python
+  modules for accessing and working with online astronomy data
+  and the tools and formats of the virtual observatory
+  astronomical data in a uniform way.
+

coatpy/__init__.py

@@ -0,0 +1,3 @@
+from volib import *
+from volib import utils
+from vaods9 import Client as vaods9

coatpy/vaods9.py

@@ -0,0 +1,91 @@
+import sampy
+import urlparse
+import os
+
+def ds9echo(response):
+	print response
+
+class Client(sampy.SAMPIntegratedClient):
+
+	def __init__(self,
+			name="VAO Python Client",
+			description="An interactive SAMP client for Python by the Virtual Astronomical Observatory", 				version="0.0.1"):
+		self.metadata = {"samp.name": name, "samp.description.text": description, "client.version": version}
+		sampy.SAMPIntegratedClient.__init__(self)
+		self.do_close_hub = False
+		if len(self.hub.getRunningHubs()) == 0:
+			self.samp_hub = sampy.SAMPHubServer()
+			self.samp_hub.start()
+			self.do_close_hub = True
+		self.connect()
+		self.declareMetadata(self.metadata)
+	
+	def set(self, cmd, url=""):
+		message = {"samp.mtype": "ds9.set", "samp.params":{"cmd": cmd, "url":url}}
+		self.callAll("vaods9set", message)
+		
+	def get(self, cmd, url="", tag="vaods9get", function=ds9echo):
+		self.bindReceiveResponse(tag, self.handler_wrapper)
+		self.handler = function
+		message = {"samp.mtype": "ds9.get", "samp.params":{"cmd": cmd, "url":url}}
+		self.callAll(tag, message)
+
+	def get_now(self, cmd, url="", tag="vaods9getnow", timeout=1000):
+		message = {"samp.mtype": "ds9.get", "samp.params":{"cmd": cmd, "url":url}}
+		try:
+			response = self.callAndWait(self.ds9_hook, message, timeout)
+			return response['samp.result']['value']
+		except:
+			pass
+
+	def basic_handler(self, private_key, sender_id, msg_id, response):
+		self.last_response = response['samp.result']['value']
+		
+	def basic_get(self, cmd, url=""):
+		self.bindReceiveResponse("vaods9basicget", self.basic_handler)
+		message = {"samp.mtype": "ds9.get", "samp.params":{"cmd": cmd, "url":url}}
+		self.callAll("vaods9basicget", message)
+
+	def cleanup(self):
+		self.disconnect()
+		print "client disconnected"
+		if self.do_close_hub:
+			self.samp_hub.stop()
+
+	def handler_wrapper(self, private_key, sender_id, msg_id, response):
+		ds9response = response['samp.result']['value']
+		self.handler(ds9response)
+
+	def send(self, mtype, file_id, file_path):
+		self.file_path = file_path
+		message = {'samp.mtype': mtype,'samp.params': {'name': file_id, 'url': self.file_url}}
+		self.callAll("vaods9send", message)
+
+	def send_votable(self, name, file_path):
+		self.send('table.load.votable', name, file_path)
+
+	def send_fits_image(self, name, file_path):
+		self.send('image.load.fits', name, file_path)
+		
+	def send_fits_table(self, name, file_path):
+		self.send('table.load.fits', name, file_path)
+
+	@property
+	def file_url(self):
+		url = urlparse.urlparse(self.file_path)
+		if url.scheme == '' :
+			abspath = os.path.abspath(self.file_path)
+			return 'file://'+abspath
+		return self.file_path
+
+	@property
+	def ds9_hook(self):
+		ds9_candidates = self.getSubscribedClients("ds9.get")
+		if(len(ds9_candidates)==1):
+			return ds9_candidates.keys()[0]
+		if(len(ds9_candidates)>=2):
+			print "Warning, more than one instance of DS9 found"
+			return ds9_candidates.keys()[0]
+		print "Error, couldn't find any DS9 instances running"
+		
+

coatpy/volib/__init__.py

@@ -0,0 +1,7 @@
+from xparser import XParser, XNode
+from votable import VOTable
+from volib import ConeSearch, VOWebService
+from volib import Siap, Sesame
+import utils
+
+__all__ = ["VOTable","ConeSearch","Siap","Sesame"]

coatpy/volib/utils/Coords.py

@@ -0,0 +1,97 @@
+'''
+Created on Mar 9, 2011
+
+Coordinates conversion functions
+
+@author: shkwok
+'''
+
+def any2Decimal (str1):
+    '''
+    Input str1 as dd:mm:ss
+    outputs degree as decimal
+    '''
+    def split (inStr):
+        '''   
+        Converts HH:MM:SS to (HH, MM, SS)
+        '''
+        str1 = inStr + " 0 0 0"
+        str1 = str1.strip()
+        out = str1.replace("h", " ").replace("m", " ").replace("s", " ").replace (":", " ").split(" ")
+        return (out[0], out[1], out[2])
+    
+    hh, mm, ss = split (str1)
+    sign = 1.0
+    if hh.startswith ('-'):
+        sign = -1.0
+        hh = hh.replace ('-', '')
+        
+    try:
+        hh = float (hh)
+        mm = float (mm) / 60.0
+        ss = float (ss) / 3600.0
+        return sign * (hh + mm + ss)    
+    except:
+        return 0
+
+def sexaHour2Degree (str1):
+    '''
+    Converts sexagecimal hour to degree
+    Returns degree
+    '''
+    return any2Decimal (str1) * 15.0
+        
+def degree2Sexagecimal (deg):
+    '''
+    Converts deg to dd:mm:ss.sss
+    Returns a string
+    '''
+    if deg < 0:
+        t = float (-deg)
+        sign = '-'
+    else:
+        t = float (deg)
+        sign = ''
+    dd = int (t)
+    t = (t - dd) * 60
+    mm = int (t)
+    ss = (t - mm) * 60
+
+    ssStr = "%.3f" % ss
+    if int(float(ssStr)) == 60:
+        ss = 0
+        mm += 1
+        if mm >= 60:
+            mm = 0
+            dd += 1
+    
+    ssStr = "%.3f" % ss
+    if float (ssStr) < 10:
+        ssStr = '0' + ssStr
+    
+    return "%s%02d:%02d:%s" % (sign, dd, mm, ssStr)
+
+def hour2Sexagecimal (hour):
+    '''
+    Returns hour in sexagecimal string
+    '''
+    return degree2Sexagecimal(hour)
+
+def normalize360 (deg):
+    '''
+    Returns normalized degree 0 to 360
+    '''
+    while deg < 0:
+        deg += 360
+    while deg >= 360:
+        deg -= 360
+    return deg
+
+def normalize180 (deg):
+    '''
+    Returns normalized degree -180 to 180
+    '''
+    deg = normalize360(deg)
+    if deg > 180:
+        return deg - 360
+    return deg

coatpy/volib/utils/__init__.py

@@ -0,0 +1,3 @@
+from Coords import *
+__all__ = ["any2Decimal", "split", "sexaHour2Degree", "degree2Sexagecimal",
+        "hour2Sexagecimal", "normalize360", "normalize180"]

coatpy/volib/volib/ConeSearch.py

@@ -0,0 +1,45 @@
+'''
+Created on Mar 15, 2011
+
+Class to handle Cone Search according to NVO
+    Based on version 2005-06-01 by Shui Hung Kwok
+    
+
+@author: shkwok
+
+'''
+
+import sys
+#from VOWebService import VOWebService
+from . import VOWebService
+
+class ConeSearch (VOWebService):
+    
+    def __init__ (self, url=''):
+        VOWebService.__init__ (self, url)
+
+    def buildQuery (self, parmList):
+        mustParams = ["RA", "DEC", "SR"]
+        for p in mustParams:
+            if not p in parmList:
+                raise Exception ("Parameter '%s' missing" % p)
+        return VOWebService.buildQuery (self, parmList)
+    
+    def output2CSV (self, votable, writer=sys.stdout.write):
+        idOrName = votable.getIdOrName()
+        fields = votable.getFields()
+        buf = []
+        for fd in fields:
+            attrs = fd.getAttributes ()
+            name = attrs.get (idOrName)
+            buf.append(name)
+        writer (",".join(buf))
+        writer ("\n")
+        rows = votable.getTableData ()    
+        for row in rows:
+            flist = []
+            cells = row.getChildren ("TD")
+            for cell in cells:
+                flist.append(cell.getContent ())
+            writer (",".join(flist))
+            writer ("\n")