from sfa.rspecs.pg_rspec_converter import PGRSpecConverter
from sfa.rspecs.sfa_rspec_converter import SfaRSpecConverter
from sfa.rspecs.sfa_rspec import sfa_rspec_version
-from sfa.rspecs.pg_rspec import pg_rspec_version
+from sfa.rspecs.pg_rspec import pg_rspec_ad_version, pg_rspec_request_version
from sfa.rspecs.rspec_parser import parse_rspec
rspec = parse_rspec(in_rspec)
if rspec.version['type'] == sfa_rspec_version['type']:
return in_rspec
- elif rspec.version['type'] == pg_rspec_version['type']:
+ elif rspec.version['type'] == pg_rspec_ad_version['type']:
return PGRSpecConverter.to_sfa_rspec(in_rspec)
else:
return in_rspec
@staticmethod
def to_pg_rspec(in_rspec):
rspec = parse_rspec(in_rspec)
- if rspec.version['type'] == pg_rspec_version['type']:
+ if rspec.version['type'] == pg_rspec_ad_version['type']:
return in_rspec
elif rspec.version['type'] == sfa_rspec_version['type']:
return SfaRSpecConverter.to_pg_rspec(in_rspec)