Skip to content

Commit 3c3ffd0

Browse files
keflavichbsipocz
authored andcommitted
remove duplicate code & add changelog entry
1 parent 27e6e43 commit 3c3ffd0

File tree

4 files changed

+13
-26
lines changed

4 files changed

+13
-26
lines changed

CHANGES

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
0.3.7 (2018-01-25)
2929
------------------
3030

31+
- WFAU: New tool / refactor of the UKIDSS query tool [#984].
32+
- UKIDSS: Update to DR10 as default database [#984].
3133
- New tool: Exoplanet Orbit Catalog, NASA Exoplanet Archive [#771]
3234
- ESO: The upstream API changed. We have adapted. [#970]
3335
- ESO: Added 'destination' keyword to Eso.retrieve_data(), to download files

astroquery/ukidss/core.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,11 @@ class UkidssClass(BaseWFAUClass):
5757

5858
def __init__(self, username=None, password=None, community=None,
5959
database='UKIDSSDR10PLUS', programme_id='all'):
60-
super(UkidssClass, self).__init__()
61-
self.database = database
62-
self.programme_id = programme_id # 102 = GPS
63-
self.session = None
64-
if username is None or password is None or community is None:
65-
pass
66-
else:
67-
self.login(username, password, community)
60+
super(UkidssClass, self).__init__(database=database,
61+
programme_id=programme_id,
62+
username=username,
63+
community=community,
64+
password=password)
6865

6966

7067
Ukidss = UkidssClass()

astroquery/vsa/core.py

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -59,28 +59,16 @@ class VsaClass(BaseWFAUClass):
5959

6060
def __init__(self, username=None, password=None, community=None,
6161
database='VVVDR4', programme_id='all'):
62-
super(VsaClass, self).__init__()
63-
self.database = database
64-
self.programme_id = programme_id
65-
self.session = None
66-
if username is None or password is None or community is None:
67-
pass
68-
else:
69-
self.login(username, password, community)
62+
super(VsaClass, self).__init__(database=database,
63+
programme_id=programme_id,
64+
username=username,
65+
community=community,
66+
password=password)
7067

7168
self.BASE_URL = 'http://horus.roe.ac.uk:8080/vdfs/'
7269
self.LOGIN_URL = self.BASE_URL + "DBLogin"
7370
self.IMAGE_URL = self.BASE_URL + "GetImage"
7471
self.ARCHIVE_URL = self.BASE_URL + "ImageList"
7572
self.REGION_URL = self.BASE_URL + "WSASQL"
7673

77-
self.database = database
78-
self.programme_id = programme_id
79-
self.session = None
80-
if username is None or password is None or community is None:
81-
pass
82-
else:
83-
self.login(username, password, community)
84-
85-
8674
Vsa = VsaClass()

astroquery/wfau/core.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def __init__(self, username=None, password=None, community=None,
4444
"""
4545
super(BaseWFAUClass, self).__init__()
4646
self.database = database
47-
self.programme_id = programme_id # 102 = GPS
47+
self.programme_id = programme_id
4848
self.session = None
4949
if username is None or password is None or community is None:
5050
pass

0 commit comments

Comments
 (0)