@@ -92,7 +92,7 @@ class DatasetReference(object):
92
92
ValueError: If either argument is not of type ``str``.
93
93
"""
94
94
95
- def __init__ (self , project , dataset_id ):
95
+ def __init__ (self , project : str , dataset_id : str ):
96
96
if not isinstance (project , str ):
97
97
raise ValueError ("Pass a string for project" )
98
98
if not isinstance (dataset_id , str ):
@@ -166,22 +166,24 @@ def from_string(
166
166
standard SQL format.
167
167
"""
168
168
output_dataset_id = dataset_id
169
- output_project_id = default_project
170
169
parts = _helpers ._split_id (dataset_id )
171
170
172
- if len (parts ) == 1 and not default_project :
173
- raise ValueError (
174
- "When default_project is not set, dataset_id must be a "
175
- "fully-qualified dataset ID in standard SQL format, "
176
- 'e.g., "project.dataset_id" got {}' .format (dataset_id )
177
- )
171
+ if len (parts ) == 1 :
172
+ if default_project is not None :
173
+ output_project_id = default_project
174
+ else :
175
+ raise ValueError (
176
+ "When default_project is not set, dataset_id must be a "
177
+ "fully-qualified dataset ID in standard SQL format, "
178
+ 'e.g., "project.dataset_id" got {}' .format (dataset_id )
179
+ )
178
180
elif len (parts ) == 2 :
179
181
output_project_id , output_dataset_id = parts
180
- elif len ( parts ) > 2 :
182
+ else :
181
183
raise ValueError (
182
184
"Too many parts in dataset_id. Expected a fully-qualified "
183
- "dataset ID in standard SQL format. e.g. "
184
- '"project.dataset_id", got {}' .format (dataset_id )
185
+ "dataset ID in standard SQL format, "
186
+ 'e.g. "project.dataset_id", got {}' .format (dataset_id )
185
187
)
186
188
187
189
return cls (output_project_id , output_dataset_id )
0 commit comments